summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-22.0.1Erlang/OTP2019-05-152-1/+2
* Prepare releaseErlang/OTP2019-05-153-148/+20
* Merge branch 'ingela/ssl-flow-ctrl/ERL-934/OTP-15825' into maint-22Erlang/OTP2019-05-155-72/+235
|\
| * ssl: Refactor of OTP 22 code due to patch OTP-15823Ingela Anderton Andin2019-05-152-27/+16
| * ssl: Avoid dialyzer warningIngela Anderton Andin2019-05-151-2/+2
| * ssl: Add test cases for issue reported in ERL-938Ingela Anderton Andin2019-05-151-0/+157
| * ssl: Internal active n must back off when user does not read dataIngela Anderton Andin2019-05-151-38/+55
| * ssl: Remove legacy calls to next_recordIngela Anderton Andin2019-05-152-5/+5
|/
* Updated OTP versionOTP-22.0Erlang/OTP2019-05-102-1/+2
* Prepare releaseErlang/OTP2019-05-1075-196/+2161
* Eliminate process yield after each call to length/1Björn Gustavsson2019-05-101-1/+1
* Merge branch 'maint'Rickard Green2019-05-092-0/+34
|\
| * Merge tag 'OTP-21.3.7.1' into maintRickard Green2019-05-093-8/+34
| |\
| | * Updated OTP versionOTP-21.3.7.1Rickard Green2019-05-092-1/+2
| | * Prepare releaseRickard Green2019-05-093-2/+35
| | * Merge branch 'rickard/ei-nodename/OTP-15781'Rickard Green2019-05-092-5/+13
| | |\
* | | \ Merge branch 'lukas/fix-run-dialyzer'Lukas Larsson2019-05-091-1/+1
|\ \ \ \
| * | | | otp: Don't error dialyzer script if WARNINGS failLukas Larsson2019-05-071-1/+1
* | | | | Merge branch 'ingela/ssl/revert-ctrl-flow'Ingela Anderton Andin2019-05-091-9/+7
|\ \ \ \ \
| * | | | | Revert "ssl: Add check when to toggle internal active N"Ingela Anderton Andin2019-05-071-9/+7
| |/ / / /
* | | | | Merge branch 'maint'Rickard Green2019-05-091-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bump forward merge script versionRickard Green2019-05-091-1/+1
* | | | | Merge branch 'raimo/inet_crypto_dist'Raimo Niskanen2019-05-082-371/+583
|\ \ \ \ \
| * | | | | Rekey also the shared secretRaimo Niskanen2019-05-081-97/+145
| * | | | | Use shared secret to rekeyRaimo Niskanen2019-05-031-5/+16
| * | | | | Cycle the keypair by time and countRaimo Niskanen2019-05-031-17/+34
| * | | | | Set socket buffer sizes to avoid handshake deadlockRaimo Niskanen2019-05-031-11/+22
| * | | | | Keep the keypair for the node's lifetimeRaimo Niskanen2019-04-181-39/+86
| * | | | | Implement some kind of PEKE to get forward secrecyRaimo Niskanen2019-04-171-185/+190
| * | | | | Use incrementing IVRaimo Niskanen2019-04-091-24/+30
| * | | | | Use Erlang cookie as shared secretRaimo Niskanen2019-04-032-278/+345
* | | | | | Merge branch 'maint'Rickard Green2019-05-0815-11/+215
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Fix bad merge from maint-21Rickard Green2019-05-081-1/+1
| * | | | Fix bad merge from maint-21Rickard Green2019-05-083-2528/+78
| * | | | Merge branch 'maint-21' into maintIngela Anderton Andin2019-05-0717-12/+2673
| |\ \ \ \
| | * | | | Updated OTP versionOTP-21.3.8Erlang/OTP2019-05-062-1/+2
| | * | | | Prepare releaseErlang/OTP2019-05-0617-12/+224
| | * | | | Merge branch 'sverker/process_info-reductions-fix/OTP-15793' into maint-21Erlang/OTP2019-05-062-2/+2
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'siri/ct/safe-write-log-cache/ERIERL-342/OTP-15758' into maint-21Erlang/OTP2019-05-061-4/+10
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'siri/ct/reset_curr_tc/ERIERL-334/OTP-15717' into maint-21Erlang/OTP2019-05-0610-40/+903
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'siri/ct/fuzzer_support/ERIERL-143/OTP-14746' into maint-21Erlang/OTP2019-05-0616-150/+1762
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'raimo/stdlib/gen_statem-sync-timer-cancel/OTP-15295' into maint-21Erlang/OTP2019-05-061-147/+83
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/O...Erlang/OTP2019-05-0615-468/+423
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/flow-ctrl/ERL-934/OTP-15802' into maint-21Erlang/OTP2019-05-061-7/+9
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/ei-nodename/OTP-15781' into maint-21Erlang/OTP2019-05-062-5/+13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
* | | | | | | | | | | | Merge branch 'ingela/ssl/openssl-test-cuddle'Ingela Anderton Andin2019-05-071-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ssl: Add necessary compliance checkIngela Anderton Andin2019-05-061-1/+7
* | | | | | | | | | | | | Merge branch 'ingela/ssl/dialyzer-fix'Ingela Anderton Andin2019-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ssl: Fix dialyzer specIngela Anderton Andin2019-05-071-1/+1
* | | | | | | | | | | | | | Merge branch 'sverker/ei_set_compal_rel-doc'Sverker Eriksson2019-05-071-19/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \