summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | Add new api eldap:info/1anupamasingh102023-04-254-67/+24
| * | | | | | | | | | | | | | | | | | | | | | | | Add new api conn_info for SSL connections to LDAP serveranupamasingh102023-04-252-7/+9
| * | | | | | | | | | | | | | | | | | | | | | | | Add new api conn_info for SSL connections to LDAP serveranupamasingh102023-04-253-4/+107
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bjorn/erts/utf32/24/OTP-18560' into maintBjörn Gustavsson2023-04-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Eliminate crash in matching of utf32 segmentBjörn Gustavsson2023-04-243-0/+12
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maintBjörn Gustavsson2023-04-254-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Eliminate crash in matching of utf32 segmentBjörn Gustavsson2023-04-244-0/+18
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dgud/wx/fix-debug/OTP-18512' into maintDan Gudmundsson2023-04-2531-2625/+2911
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | wx: Use temp env for send_msgDan Gudmundsson2023-04-241-0/+3
| * | | | | | | | | | | | | | | | | | | | | | gl: Fix glDebugMessage functionalityDan Gudmundsson2023-04-248-64/+117
| * | | | | | | | | | | | | | | | | | | | | | Fix testsDan Gudmundsson2023-04-241-4/+7
| * | | | | | | | | | | | | | | | | | | | | | Fix wx-3.2 macros and OpenGL supportDan Gudmundsson2023-04-2414-2542/+2703
| * | | | | | | | | | | | | | | | | | | | | | wx: Add debug printouts for OpenGLDan Gudmundsson2023-04-028-27/+71
| * | | | | | | | | | | | | | | | | | | | | | wx: Improve debug printoutsDan Gudmundsson2023-03-143-9/+31
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into maintRickard Green2023-04-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | [erts] Fix build without native atomicsRickard Green2023-04-241-0/+1
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rickard/mon-link-dbg-fix' into maintRickard Green2023-04-241-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | [erts] Fix debug functionalty for monitors/linksRickard Green2023-04-121-6/+16
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-24' into maintJakub Witczak2023-04-218-4/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Updated OTP versionOTP-24.3.4.11maint-24Erlang/OTP2023-04-202-1/+2
| * | | | | | | | | | | | | | | | | | | | Prepare releaseErlang/OTP2023-04-207-7/+103
| * | | | | | | | | | | | | | | | | | | | Update copyright yearErlang/OTP2023-04-208-8/+8
| * | | | | | | | | | | | | | | | | | | | Merge branch 'kuba/maint-24/inets/fix_httpc_remote_socket_close/OTP-18545' in...Erlang/OTP2023-04-201-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/24.3/OTP-18557' into maint-24Erlang/OTP2023-04-204-6/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/test-stop-using-weak-key' into maint-24Erlang/OTP2023-04-201-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'ingela/maint-24/correct-sigalg-order/OTP-18550' into maint-24Erlang/OTP2023-04-202-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/dist-entry-bug-node-down/OTP-18243' into maint-24Erlang/OTP2023-04-201-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/24.3.4.9/erts/decode-unsorted-smallmap-in-hashmap/OTP-1...Erlang/OTP2023-04-202-59/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/23/erts/decode-unsorted-smallmap-in-hashmap/OTP-18343'Sverker Eriksson2023-03-232-59/+93
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maint-24Erlang/OTP2023-04-201-16/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kuba/maint-24/inets/fix_httpc_remote_socket_close/OTP-18545' in...Jakub Witczak2023-04-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | inets: httpc fix for socket closingJakub Witczak2023-04-181-8/+18
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'u3s_github/kuba/crypto/fix_len_var_type/OTP-185...Jakub Witczak2023-04-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | crypto: dh.c change len type to ErlNifUInt64Jakub Witczak2023-04-171-2/+2
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ingela/ssl/test-stop-using-weak-key' into maintIngela Anderton Andin2023-04-201-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | ssl: Let test case use stronger keyIngela Anderton Andin2023-04-171-7/+15
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/25.3/OTP-18557' into maintSverker Eriksson2023-04-194-6/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/24.3/OTP-18557' into rickard/aliasmoni...Rickard Green2023-04-184-6/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | / / / / / / / / / / / / / | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | [erts] Fix erroneous removal of alias from alias tableRickard Green2023-04-184-6/+57
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'john/erts/fix-ic-dc-config-test/OTP-18554' into maintJohn Högberg2023-04-175-14/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Update configure scriptsJohn Högberg2023-04-142-7/+27
| * | | | | | | | | | | | | | | | | | | | | | erts: Fix ic/dc config tests and usageJohn Högberg2023-04-143-7/+26
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'john/erts/fix-overlapping-code-barriers-25/OTP-18553' into maintJohn Högberg2023-04-111-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | erts: Fix overlapping blocking code barriers in the same tickJohn Högberg2023-04-111-6/+17
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ingela/maint-24/correct-sigalg-order/OTP-18550' into maintIngela Anderton Andin2023-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | ssl: Honor signatur alogithm input orderIngela Anderton Andin2023-04-062-4/+9
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ingela/ssl/correct-sigalg-order/OTP-18550' into maintIngela Anderton Andin2023-04-062-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | ssl: Honor signatur alogithm input orderIngela Anderton Andin2023-04-062-4/+9
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maintRickard Green2023-03-231-16/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'rickard/driver-call-callback-fix/23.3.4/OTP-18525' into rickard...Rickard Green2023-03-201-16/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |