summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Prepare releaseErlang/OTP2015-06-2364-31/+2308
* Merge branch 'ia/ssl/modern-timetrap'Ingela Anderton Andin2015-06-2318-162/+193
|\
| * ssl: Make init functions fail if make_certs:all failsIngela Anderton Andin2015-06-2215-60/+31
| * ssl: Avoid sleepIngela Anderton Andin2015-06-223-24/+25
| * ssl: modernize timetrap handlingIngela Anderton Andin2015-06-2217-78/+137
* | Merge branch 'bruce/change-license'Bruce Yinhe2015-06-225041-48651/+53512
|\ \
| * | fix errors caused by changed line numbersBruce Yinhe2015-06-2280-80/+0
| * | Change license text to APLv2Bruce Yinhe2015-06-185041-48574/+53515
* | | Merge branch 'kostis/hipe-no-dial-warnings'Henrik Nord2015-06-222-42/+13
|\ \ \ | |_|/ |/| |
| * | Eliminate a dialyzer warningKostis Sagonas2015-06-131-9/+6
| * | Simplify handling of o2 and o3 option expansionKostis Sagonas2015-06-131-33/+7
* | | dialyzer: Correction of last commitHans Bolinder2015-06-221-9/+6
* | | Merge branch 'anders/diameter/18/OTP-12588'Anders Svensson2015-06-227-118/+20
|\ \ \
| * | | vsn -> 1.10Anders Svensson2015-06-201-1/+1
| * | | Remove dead upgrade-related codeAnders Svensson2015-06-203-43/+7
| * | | Update appup for 18Anders Svensson2015-06-171-72/+10
| * | | Fix release note typoAnders Svensson2015-06-171-1/+1
| * | | Fix comment typoAnders Svensson2015-06-171-1/+1
* | | | Merge branch 'anders/diameter/sctp/OTP-12768'Anders Svensson2015-06-227-231/+179
|\ \ \ \
| * | | | Fix connection timeouts in test transportsAnders Svensson2015-06-211-3/+15
| * | | | Fix start order of alternate transportsAnders Svensson2015-06-211-5/+8
| * | | | Log discarded answersAnders Svensson2015-06-201-1/+2
| * | | | Ensure accepting processes are first in, first outAnders Svensson2015-06-191-26/+25
| * | | | Remove upgrade-related codeAnders Svensson2015-06-191-38/+4
| * | | | Be less parallel in traffic suiteAnders Svensson2015-06-191-9/+9
| * | | | Increase send/receive buffers for testsuite SCTP listenersAnders Svensson2015-06-191-4/+18
| * | | | Decrease unnecessarily long testsuite timetrapsAnders Svensson2015-06-192-3/+6
| * | | | Simplify accepting transport startAnders Svensson2015-06-191-19/+15
| * | | | Simplify peeloff signalingAnders Svensson2015-06-191-19/+15
| * | | | Simplify socket close at terminateAnders Svensson2015-06-191-16/+0
| * | | | Don't monitor listener after peeloffAnders Svensson2015-06-191-20/+12
| * | | | Don't receive initial messages out of orderAnders Svensson2015-06-191-26/+36
| * | | | Remove assumption that SCTP association ids will be uniqueAnders Svensson2015-06-191-105/+77
| |/ / /
* | | | Merge branch 'anders/diameter/grouped_errors/OTP-12721'Anders Svensson2015-06-223-27/+125
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix decode of Grouped AVPs containing errorsAnders Svensson2015-06-183-15/+106
| * | | Simplify logicAnders Svensson2015-06-171-1/+1
| * | | Simplify logicAnders Svensson2015-06-171-11/+18
| |/ /
* | | dialyzer: Expand opaque types before other typesHans Bolinder2015-06-181-11/+31
* | | Merge branch 'egil/cuddle-tests'Björn-Egil Dahlberg2015-06-171-27/+28
|\ \ \
| * | | kernel: Remove ?line macros in inet_SUITE:t_gethostbyaddr/1Björn-Egil Dahlberg2015-06-091-27/+28
* | | | Merge branch 'egil/license-compliance/OTP-12848'Björn-Egil Dahlberg2015-06-171-2/+1
|\ \ \ \
| * | | | Revert "Add number of entries to mnesia copy debug message"Björn-Egil Dahlberg2015-06-161-2/+1
* | | | | Merge branch 'legoscia/dbg-doc'Henrik Nord2015-06-171-3/+4
|\ \ \ \ \
| * | | | | Fix markup in dbg.xmlMagnus Henoch2015-06-171-3/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'egil/fix-compiler-beam_bool/OTP-12844'Björn-Egil Dahlberg2015-06-173-9/+109
|\ \ \ \ \
| * | | | | compiler: Add regressions_SUITEBjörn-Egil Dahlberg2015-06-172-0/+99
| * | | | | compiler: Fix beam_bool pass for get_map_elementsBjörn-Egil Dahlberg2015-06-171-9/+10
* | | | | | Merge branch 'nybek/fix_so_linger_zero__simple'Raimo Niskanen2015-06-175-3/+352
|\ \ \ \ \ \
| * | | | | | Fix socket option {linger, {true, 0}} to abort TCP connectionsRory Byrne2015-06-091-2/+35
| * | | | | | Apply 'show_econnreset' socket option to send errors as wellRory Byrne2015-06-092-3/+181