summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2635 from sircinek/user-defined-tls-alert-for-selfsigned-...Ingela Andin2020-05-263-2/+19
|\
| * Use warning instead of note.Marcin Sikora2020-05-191-3/+3
| * Trigger CI.Marcin Sikora2020-05-170-0/+0
| * Add documentation describing changed behavior.Marcin Sikora2020-05-171-0/+4
| * Use user returned path validation error for selfsigned cert;Marcin Sikora2020-05-032-2/+15
* | Merge branch 'bmk/megaco/20200520/mini_parser_ipv6/23/OTP-16631' into maintMicael Karlberg2020-05-260-0/+0
|\ \
| * | [megaco|test] Add test casesMicael Karlberg2020-05-201-2/+399
| * | [megaco] Mini text parser IPv6 address failureMicael Karlberg2020-05-201-4/+4
* | | Merge branch 'raimo/test-case-cuddling' into maintRaimo Niskanen2020-05-251-53/+54
|\ \ \
| * | | Tweak timeoutsRaimo Niskanen2020-05-181-53/+54
| |/ /
* | | Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson2020-05-202-237/+246
|\ \ \
| * | | crypto/test: Update check for crypto startedHans Nilsson2020-05-202-2/+11
| * | | crypto/test: Re-write testsHans Nilsson2020-05-191-200/+119
| * | | crypto/test: Better loggingHans Nilsson2020-05-191-6/+5
| * | | crypto/test: Add logging to rsa encrypt/decryptHans Nilsson2020-05-191-0/+21
| * | | crypto/test: Fresh-up ecdh and add eddh groupsHans Nilsson2020-05-191-15/+26
| * | | crypto/test: Better coverage for edward curvesHans Nilsson2020-05-191-9/+53
| * | | crypto/test: Minor fixesHans Nilsson2020-05-191-18/+23
| * | | crypto/test: Remove bad option in rsa enc/dec testHans Nilsson2020-05-191-2/+3
* | | | Merge branch 'maint-23' into maintRickard Green2020-05-207-3/+66
|\ \ \ \
| * | | | Updated OTP versionOTP-23.0.1Erlang/OTP2020-05-202-1/+2
| * | | | Prepare releaseErlang/OTP2020-05-205-202/+63
| * | | | Merge branch 'bjorn/compiler/beam_ssa_bool/ERL-1253/OTP-16657' into maint-23Erlang/OTP2020-05-202-0/+211
| |\ \ \ \
| * \ \ \ \ Merge branch 'bmk/kernel/20200514/sctp_and_udp_recv_hangs_on_close/m22/OTP-16...Erlang/OTP2020-05-203-18/+225
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bjorn/compiler/beam_ssa_bool/ERL-1246/OTP-16652' into maint-23Erlang/OTP2020-05-202-3/+30
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dgud/fix-win-installer/OTP-16582' into maint-23Erlang/OTP2020-05-202-9/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into mai...Erlang/OTP2020-05-201-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint-21' into maintRickard Green2020-05-202-0/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated OTP versionOTP-21.3.8.16Erlang/OTP2020-05-192-1/+2
| * | | | | | | | | Prepare releaseErlang/OTP2020-05-193-5/+63
| * | | | | | | | | Merge branch 'rickard/low-prio-sys-task-delay-bufix-21/OTP-16642' into maint-21Erlang/OTP2020-05-192-3/+118
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'rickard/low-prio-sys-task-delay-bufix/OTP-16642' into rickard/l...Rickard Green2020-05-082-3/+118
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch 'rickard/dirty-check-proc-code-bugfix/OTP-16641' into maint-21Erlang/OTP2020-05-191-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/literal-gc-bugfix/OTP-16640' into maint-21Erlang/OTP2020-05-191-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into mai...Erlang/OTP2020-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | / / / / / / / | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint-22' into maintRickard Green2020-05-204-0/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Updated OTP versionOTP-22.3.4.1Erlang/OTP2020-05-192-1/+2
| * | | | | | | | | | | | | Prepare releaseErlang/OTP2020-05-198-10/+86
| * | | | | | | | | | | | | Merge branch 'bmk/kernel/20200514/sctp_and_udp_recv_hangs_on_close/m22/OTP-16...Erlang/OTP2020-05-193-18/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'bmk/megaco/20200512/mini_parser_ipv6/22.3/OTP-16631' into maint-22Erlang/OTP2020-05-193-8/+405
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'f3c0/loaded_application_fix/PR-2601/OTP-16627' into maint-22Erlang/OTP2020-05-191-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/crashdump-timer-segv/ERL-1105/OTP-16596' into maint-22Erlang/OTP2020-05-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into mai...Erlang/OTP2020-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into maintRickard Green2020-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix inconsistent merge of delayed sys-tasks with other sys-tasksRickard Green2020-05-191-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'dgud/fix-win-installer/OTP-16582' into maintDan Gudmundsson2020-05-192-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Prefer newer compilersDan Gudmundsson2020-05-151-5/+5
| * | | | | | | | | | | | | | | | Add version to installerDan Gudmundsson2020-05-131-4/+4
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update pre-push hook after master releaseBjörn Gustavsson2020-05-191-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bjorn/compiler/beam_ssa_bool/ERL-1253/OTP-16657' into maintBjörn Gustavsson2020-05-192-0/+211
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |