summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-21.2.3Erlang/OTP2019-01-152-1/+2
* Prepare releaseErlang/OTP2019-01-159-5/+99
* Merge branch 'rickard/dirty_scheduler_collapse/maint-21/OTP-15509' into maint-21Erlang/OTP2019-01-152-50/+110
|\
| * Merge branch 'rickard/dirty_scheduler_collapse/OTP-15509' into rickard/dirty_...Rickard Green2019-01-112-50/+110
| |\
| | * Fix bug causing dirty scheduler sleeper list inconsistencyRickard Green2019-01-112-59/+119
* | | Merge branch 'john/erts/prim_file-init-restart/OTP-15495/ERL-821' into maint-21Erlang/OTP2019-01-158-48/+116
|\ \ \
| * | | Remove an unused variableJohn Högberg2019-01-081-2/+0
| * | | Spawn prim_file helper as a system processJohn Högberg2019-01-077-46/+116
| |/ /
* | | Merge branch 'peterdmv/ssl/fix-srp-encode-decode/ERL-790/OTP-15477' into main...Erlang/OTP2019-01-152-3/+30
|\ \ \
| * | | ssl: Fix encoding/decoding of the SRP extensionPéter Dimitrov2019-01-082-3/+30
| |/ /
* | | Merge branch 'ingela/ssl/enhance-error-handling/OTP-15505' into maint-21Erlang/OTP2019-01-154-125/+62
|\ \ \
| * | | ssl: Cuddle test casesIngela Anderton Andin2019-01-082-105/+55
| * | | ssl: Fix test caseIngela Anderton Andin2019-01-081-18/+5
| * | | ssl: Fix two invalid gen_statem returnsLoïc Hoguin2019-01-081-2/+2
| |/ /
* | | Merge branch 'ingela/maint-21/active-once/ERL-371/OTP-15504' into maint-21Erlang/OTP2019-01-152-2/+58
|\ \ \
| * | | ssl: Guarantee active once data deliveryIngela Anderton Andin2019-01-082-2/+58
| |/ /
* | | Merge branch 'lars/xmerl/bug-in-detect-charset/OTP-15492' into maint-21Erlang/OTP2019-01-151-70/+66
|\ \ \
| * | | [xmerl] Fix detect charset crashLars Thorsen2019-01-071-70/+66
| | |/ | |/|
* | | Merge branch 'bjorn/compiler/interim-tuple-bug/OTP-15501/ERL-807' into maint-21Erlang/OTP2019-01-152-135/+23
|\ \ \ | |_|/ |/| |
| * | Remove unsafe optimization for delaying creation of stackframeBjörn Gustavsson2019-01-072-135/+23
|/ /
* | Updated OTP versionOTP-21.2.2Erlang/OTP2018-12-272-1/+2
* | Prepare releaseErlang/OTP2018-12-273-5/+17
* | Merge branch 'hans/ssh/port_leak/OTP-15397' into maint-21Erlang/OTP2018-12-272-20/+62
|\ \
| * | ssh: Fix port leakage for daemons failing at startHans Nilsson2018-12-211-19/+41
| * | ssh: Add port close testHans Nilsson2018-12-211-0/+20
* | | Updated OTP versionOTP-21.2.1Erlang/OTP2018-12-202-1/+2
* | | Prepare releaseErlang/OTP2018-12-205-66/+66
* | | Merge branch 'ingela/ssl/patch-maint-21/ERL-308/OTP-15489' into maint-21Erlang/OTP2018-12-209-600/+809
|\ \ \
| * | | ssl: Fix renegotiation with new TLS senderIngela Anderton Andin2018-12-203-4/+36
| * | | ssl: Add renegotiate test caseIngela Anderton Andin2018-12-201-0/+52
| * | | ssl: Remove no longer needed functionsIngela Anderton Andin2018-12-203-38/+33
| * | | ssl: Fix downgradeIngela Anderton Andin2018-12-205-51/+94
| * | | ssl: Remove checks and conversions not neededIngela Anderton Andin2018-12-202-48/+45
| * | | ssl: Use binary:copy/2 to avoid list overheadIngela Anderton Andin2018-12-201-2/+2
| * | | ssl: Remove unnecessary internal eventIngela Anderton Andin2018-12-203-17/+16
| * | | ssl: Clean codeIngela Anderton Andin2018-12-203-26/+21
| * | | ssl: Add static_env recordIngela Anderton Andin2018-12-205-430/+526
* | | | Merge branch 'sverker/big-band-bug/ERL-804/OTP-15487' into maint-21Erlang/OTP2018-12-202-4/+42
|\ \ \ \
| * | | | erts: Fix bug in 'band' of two negative numbers, one bigSverker Eriksson2018-12-172-4/+42
* | | | | Merge branch 'sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486' into ...Erlang/OTP2018-12-202-1/+4
|\ \ \ \ \
| * | | | | erts: Fix possible heap corruption getting atomicsTomas Abrahamsson2018-12-132-1/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'sverker/erts/prim_file-perm-own-bigendian/OTP-15485' into maint-21Erlang/OTP2018-12-201-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | erts: Fix warning and potential big-endian-bug in prim_fileSverker Eriksson2018-12-131-2/+2
|/ / / /
* | | | Updated OTP versionOTP-21.2Erlang/OTP2018-12-102-1/+2
* | | | Prepare releaseErlang/OTP2018-12-1042-43/+969
* | | | Merge branch 'maint-20' into maintHenrik Nord2018-12-072-1/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Updated OTP versionOTP-20.3.8.15Erlang/OTP2018-12-062-1/+2
| * | | Prepare releaseErlang/OTP2018-12-063-2/+18
| * | | Merge branch 'henrik/ERIERL-278/OTP-15470' into maint-20Erlang/OTP2018-12-062-2/+16
| |\ \ \
* | \ \ \ Merge branch 'dgud/wx/perf-imp' into maintDan Gudmundsson2018-12-073-4/+5
|\ \ \ \ \