summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'HEADmasterSverker Eriksson5 hours1-2/+7
|\
| * Merge PR-2625 from max-au/max-au/honour-dist-backlog OTP-16694maintSverker Eriksson5 hours1-2/+7
| |\
| | * inet_tcp_dist: honour {backlog, NNN} setting coming from inet_dist_listen_opt...Maxim Fedorov13 days1-2/+7
* | | Merge branch 'maint'Sverker Eriksson6 hours1-2/+1
|\ \ \ | |/ /
| * | Merge branch 'sverker/doc/fix-hidden-since/ERL-1259/OTP-16661' into maintSverker Eriksson6 hours1-2/+1
| |\ \
| | * | doc: Fix hidden "since" versionsSverker Eriksson7 days1-2/+1
* | | | Merge branch 'maint'Sverker Eriksson7 hours2-3/+11
|\ \ \ \ | |/ / /
| * | | Merge 'sverker/erts/hopefull-enc-export-fun/OTP-16693/ERL-1254' into maintSverker Eriksson7 hours2-3/+11
| |\ \ \
| | * | | erts: Fix bug in encoding of export fun on pending connectionSverker Eriksson37 hours2-3/+11
| | |/ /
* | | | Merge branch 'maint'Sverker Eriksson32 hours4-59/+78
|\ \ \ \ | |/ / /
| * | | Merge branch 'sverker/ets-test-cuddle' into maintSverker Eriksson32 hours1-57/+59
| |\ \ \
| | * | | ets_SUITE: Improve etsmem to get consistent memory snapshotSverker Eriksson2020-05-131-53/+55
| | * | | ets_SUITE: Shorten some test casesSverker Eriksson2020-05-121-4/+4
| * | | | Merge pull request #2635 from sircinek/user-defined-tls-alert-for-selfsigned-...Ingela Andin33 hours3-2/+19
| |\ \ \ \
| | * | | | Use warning instead of note.Marcin Sikora8 days1-3/+3
| | * | | | Trigger CI.Marcin Sikora10 days0-0/+0
| | * | | | Add documentation describing changed behavior.Marcin Sikora10 days1-0/+4
| | * | | | Use user returned path validation error for selfsigned cert;Marcin Sikora2020-05-032-2/+15
* | | | | | Merge branch 'maint'Micael Karlberg33 hours0-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'bmk/megaco/20200520/mini_parser_ipv6/23/OTP-16631' into maintMicael Karlberg33 hours0-0/+0
| |\ \ \ \ \
| | * | | | | [megaco|test] Add test casesMicael Karlberg7 days1-2/+399
| | * | | | | [megaco] Mini text parser IPv6 address failureMicael Karlberg7 days1-4/+4
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'maint-23'Ao Song38 hours1-2/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'andy/http_request/OTP-16663' into maint-23Ao Song38 hours1-2/+4
| |\ \ \ \ \ \
| | * | | | | | http_request: Fix to handle undefined port in uriAo Song2 days1-2/+4
| |/ / / / / /
* | | | | | | Merge pull request #2627 from richcarl/drop-obsolete-abstract-formatBjörn Gustavsson2 days9-78/+3
|\ \ \ \ \ \ \
| * | | | | | | Drop old code for handling pre-R15 abstract formatRichard Carlsson8 days9-78/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint'Raimo Niskanen3 days1-53/+54
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'raimo/test-case-cuddling' into maintRaimo Niskanen3 days1-53/+54
| |\ \ \ \ \ \
| | * | | | | | Tweak timeoutsRaimo Niskanen10 days1-53/+54
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'maint'Hans Nilsson7 days2-237/+246
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson7 days2-237/+246
| |\ \ \ \ \ \
| | * | | | | | crypto/test: Update check for crypto startedHans Nilsson7 days2-2/+11
| | * | | | | | crypto/test: Re-write testsHans Nilsson9 days1-200/+119
| | * | | | | | crypto/test: Better loggingHans Nilsson9 days1-6/+5
| | * | | | | | crypto/test: Add logging to rsa encrypt/decryptHans Nilsson9 days1-0/+21
| | * | | | | | crypto/test: Fresh-up ecdh and add eddh groupsHans Nilsson9 days1-15/+26
| | * | | | | | crypto/test: Better coverage for edward curvesHans Nilsson9 days1-9/+53
| | * | | | | | crypto/test: Minor fixesHans Nilsson9 days1-18/+23
| | * | | | | | crypto/test: Remove bad option in rsa enc/dec testHans Nilsson9 days1-2/+3
* | | | | | | | Merge branch 'maint'Rickard Green7 days5-2/+59
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-23' into maintRickard Green7 days7-3/+66
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Updated OTP versionOTP-23.0.1maint-23Erlang/OTP8 days2-1/+2
| | * | | | | | Prepare releaseErlang/OTP8 days5-202/+63
| | * | | | | | Merge branch 'bjorn/compiler/beam_ssa_bool/ERL-1253/OTP-16657' into maint-23Erlang/OTP8 days2-0/+211
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'bmk/kernel/20200514/sctp_and_udp_recv_hangs_on_close/m22/OTP-16...Erlang/OTP8 days3-18/+225
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'bjorn/compiler/beam_ssa_bool/ERL-1246/OTP-16652' into maint-23Erlang/OTP8 days2-3/+30
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'dgud/fix-win-installer/OTP-16582' into maint-23Erlang/OTP8 days2-9/+9
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into mai...Erlang/OTP8 days1-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint'Rickard Green8 days2-0/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /