summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prepare releaseErlang/OTP2021-05-2019-233/+176
* Merge branch 'rickard/megaco-appup' into maint-24Erlang/OTP2021-05-201-2/+4
|\
| * Update megaco.appupRickard Green2021-05-201-2/+4
* | Merge branch 'dgud/wx/fix-build-std/GH-4834/OTP-17407' into maint-24Erlang/OTP2021-05-202-3/+33
|\ \
| * | wx: Fix compile errorDan Gudmundsson2021-05-172-3/+33
| |/
* | Merge branch 'rickard/ded_ldflags_conftest/OTP-17419' into maint-24Erlang/OTP2021-05-206-68/+64
|\ \
| * | Update configure scriptsRickard Green2021-05-193-6/+6
| * | Document and fix DED_LDFLAGS_CONFTESTRickard Green2021-05-193-62/+58
* | | Merge branch 'rickard/configure/24/OTP-17420' into maint-24Erlang/OTP2021-05-2026-15/+99780
|\ \ \ | |/ /
| * | Update configure scriptsRickard Green2021-05-1925-0/+99760
| * | Adjustment for github actionsRickard Green2021-05-191-15/+20
* | | Merge branch 'rickard/configure/24/OTP-17398' into maint-24Erlang/OTP2021-05-2010-149/+147
|\ \ \ | |/ /
| * | Merge 'rickard/configure/23/OTP-17398' into rickard/configure/24/OTP-17398Rickard Green2021-05-1910-149/+147
| |\ \ | | |/ | |/|
| | * Merge 'rickard/configure/OTP-17398' into rickard/configure/23/OTP-17398Rickard Green2021-05-1910-148/+147
| | |\
| | | * Support for committing of configure scriptsRickard Green2021-05-198-139/+140
* | | | Merge branch 'hans/crypto/fix_coredump/GH-4810/OTP-17391' into maint-24Erlang/OTP2021-05-202-1/+12
|\ \ \ \
| * | | | crypto: Test fixed coredump if bad enc-flagHans Nilsson2021-05-191-0/+12
| * | | | crypto: Fixed coredump if bad enc-flagHans Nilsson2021-05-191-1/+0
| | |/ / | |/| |
* | | | Merge branch 'hans/ssh/add_missing_to_ssh_file/OTP-17397' into maint-24Erlang/OTP2021-05-202-56/+119
|\ \ \ \ | |_|/ / |/| | |
| * | | ssh: Accept \r\n as well as \n as line endHans Nilsson2021-05-191-2/+2
| * | | ssh: ssh_file:encode/decode of known_host and authorized_keys filesHans Nilsson2021-05-192-56/+119
|/ / /
* | | Updated OTP versionOTP-24.0Erlang/OTP2021-05-102-1/+2
* | | Prepare releaseErlang/OTP2021-05-1094-218/+3349
* | | Merge branch 'maint'John Högberg2021-05-107-3/+64
|\ \ \
| * \ \ Merge branch 'maint-23' into maintJohn Högberg2021-05-109-4/+69
| |\ \ \ | | |/ /
| | * | Updated OTP versionOTP-23.3.4Erlang/OTP2021-05-102-1/+2
| | * | Prepare releaseErlang/OTP2021-05-107-8/+66
| | * | Merge branch 'anders/diameter/sctp/OTP-17366' into maint-23Erlang/OTP2021-05-107-27/+37
| | |\ \
| | * \ \ Merge branch 'sverker/23/ets-matchspec-stack-bug/OTP-17379' into maint-23Erlang/OTP2021-05-102-3/+38
| | |\ \ \
| | * \ \ \ Merge branch 'john/compiler/revert-container-type-subtraction/ERIERL-650/OTP-...Erlang/OTP2021-05-102-36/+7
| | |\ \ \ \
* | | \ \ \ \ Merge branch 'raimo/cuddle-tests'Raimo Niskanen2021-05-101-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Improve read_packets_verify failureRaimo Niskanen2021-05-071-0/+4
* | | | | | | | Merge branch 'maint'Anders Svensson2021-05-101-8/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'anders/diameter/sctp/OTP-17366' into maintAnders Svensson2021-05-101-8/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fix appup blunderAnders Svensson2021-05-101-8/+2
* | | | | | | | Merge branch 'maint'Anders Svensson2021-05-087-27/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'anders/diameter/sctp/OTP-17366' into maintAnders Svensson2021-05-087-27/+43
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add appupAnders Svensson2021-05-071-5/+17
| | * | | | | Suppress dialyzer warnings in codeAnders Svensson2021-05-074-6/+8
| | * | | | | Fix association id of unordered send setopts in diameter_sctpAnders Svensson2021-05-041-5/+7
| | * | | | | Fix ignored unordered option on client diameter_sctp transportAnders Svensson2021-04-302-11/+11
* | | | | | | Merge branch 'maint'John Högberg2021-05-072-36/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'john/compiler/revert-container-type-subtraction/ERIERL-650/OTP-...John Högberg2021-05-072-36/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Revert "Merge branch 'john/compiler/validator-container-type-subtraction/GH-4...John Högberg2021-05-072-36/+7
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'maint'Sverker Eriksson2021-05-072-3/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'sverker/23/ets-matchspec-stack-bug/OTP-17379' into maintSverker Eriksson2021-05-072-3/+38
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge 'sverker/22/ets-matchspec-stack-bug/OTP-17379'Sverker Eriksson2021-05-062-3/+38
| | |\ \ \ \
| | | * \ \ \ Merge 'sverker/21/ets-matchspec-stack-bug/OTP-17379'Sverker Eriksson2021-05-062-3/+38
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | erts: Fix matchspec stack depth estimation bugSverker Eriksson2021-05-062-3/+38
* | | | | | | Merge pull request #4805 from IngelaAndin/ingela/ssl/public_key/cert-doc-log-...Ingela Andin2021-05-074-10/+24
|\ \ \ \ \ \ \