summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix incorrect links on erpc docsergl2021-02-161-3/+3
* Merge branch 'hasse/tools/xref_behaviour_info_1/OTP-17191/ERL-1476/GH-4192' i...Hans Bolinder2021-02-154-36/+99
|\
| * tools: Correct Xref's handling of behaviour_info/1Hans Bolinder2021-02-124-36/+99
* | Merge branch 'ingela/ssl/cuddle-timeouts-and-versions' into maintIngela Anderton Andin2021-02-124-18/+39
|\ \
| * | ssl: Cuddle testsIngela Anderton Andin2021-02-124-18/+39
| |/
* | Merge branch 'bmk/kernel/20210208/update_os_version_check_for_macos' into maintMicael Karlberg2021-02-122-5/+5
|\ \
| * | [kernel|gen-udp|test] Adjust version checkMicael Karlberg2021-02-111-1/+1
| * | [kernel|gen-tcp-misc|test] Adjust version checkMicael Karlberg2021-02-111-4/+4
* | | Merge pull request #3049 from jonatascardador/ssh/include-longname-field-sftpdHans Nilsson2021-02-122-12/+75
|\ \ \
| * | | Add longname field in sftp version 3Jonatas Cardador2021-02-091-12/+66
| * | | Encode longname field along with file name in sftp version 3Jonatas Cardador2021-02-091-0/+9
| |/ /
* | | Merge branch 'ingela/ssl/session-handler-for-upgrade-servers/ERIERL-606/OTP-1...Ingela Anderton Andin2021-02-121-5/+14
|\ \ \
| * | | ssl: Avoid race when two upgrade servers are started close to each otherIngela Anderton Andin2021-02-111-5/+14
| | |/ | |/|
* | | Merge branch 'rickard/aux-work-fix/OTP-17185' into maintRickard Green2021-02-111-13/+16
|\ \ \
| * | | Add missing memory barriers in aux work handlingRickard Green2021-02-101-13/+16
* | | | Merge branch 'ingela/odbc/warnings' into maintIngela Anderton Andin2021-02-111-29/+54
|\ \ \ \
| * | | | odbc: Fix compiler warningsLukas Larsson2021-02-101-29/+54
* | | | | Merge pull request #3035 from aholmn/odbc/odbcserver-not-terminated-fixIngela Andin2021-02-101-3/+3
|\ \ \ \ \
| * | | | | odbc: Fix odbcserver not terminated at timeoutNiklas Åholm2021-02-051-3/+3
* | | | | | Merge branch 'sverker/erts/nif-fallback-warning' into maintSverker Eriksson2021-02-101-0/+15
|\ \ \ \ \ \
| * | | | | | erts: Add warning in erl_nif doc about match state problemSverker Eriksson2021-01-271-0/+15
* | | | | | | Merge pull request #3040 from dgud/dgud/wx/fix-mac-non-bundleDan Gudmundsson2021-02-101-13/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove old mac init codeDan Gudmundsson2021-02-081-13/+1
* | | | | | | Merge pull request #3047 from lagebr/patch-12Lukas Larsson2021-02-091-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | ct: Fix typosHenrik Lagebrand2021-02-091-3/+3
|/ / / / / /
* | | | | | Merge pull request #3002 from gomoripeti/rr_from_escript/OTP-17182Lukas Larsson2021-02-082-26/+70
|\ \ \ \ \ \
| * | | | | | shell: read records from module in escript/archivePéter Gömöri2021-02-012-26/+70
* | | | | | | Merge branch 'lukas/add-github-actions' into maintLukas Larsson2021-02-051-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix github action base image buildLukas Larsson2021-02-051-1/+3
* | | | | | | | Merge branch 'lukas/add-github-actions' into maintLukas Larsson2021-02-055-56/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Try to fix buildx cachesLukas Larsson2021-02-055-56/+57
* | | | | | | Merge branch 'sverker/valgrind-cuddle' into maintSverker Eriksson2021-02-051-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | erts: Fix valgrind uninitialized data warning in re:inspectSverker Eriksson2021-02-011-1/+1
* | | | | | | Merge pull request #3003 from dotsimon/epmd_reconnect/OTP-17178Lukas Larsson2021-02-044-7/+107
|\ \ \ \ \ \ \
| * | | | | | | Reconnect to epmdSimon Cornish2021-02-024-7/+107
* | | | | | | | Merge branch 'maint-23' into maintIngela Anderton Andin2021-02-047-4/+67
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Updated OTP versionOTP-23.2.4Erlang/OTP2021-02-042-1/+2
| * | | | | | | Prepare releaseErlang/OTP2021-02-045-7/+64
| * | | | | | | Merge branch 'ingela/maint/ssl/dist-tree/ERL-1458/OTP-17139/OTP-16239' into m...Erlang/OTP2021-02-0420-168/+432
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ingela/ssl/deprecated-ciphers-function' into maint-23Erlang/OTP2021-02-042-14/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ingela/maint/ssl/old-ciphers/ERIERL-597/OTP-17174' into maint-23Erlang/OTP2021-02-042-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bmk/snmp/manager/20210128/matching_problems_handling_snmp_error...Erlang/OTP2021-02-041-15/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'lukas/add-github-actions' into maint-23Erlang/OTP2021-02-043-42/+74
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'ingela/maint/ssl/old-ciphers/ERIERL-597/OTP-17174' into maintIngela Anderton Andin2021-02-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | ssl: Do not exclude old cipher suites for wrong reasonIngela Anderton Andin2021-02-032-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ingela/maint/ssl/dist-tree/ERL-1458/OTP-17139/OTP-16239' into m...Ingela Anderton Andin2021-02-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | ssl: Use monitor instead of linkIngela Anderton Andin2021-02-032-17/+19
| * | | | | | | | | | ssl: Make sure TLS distribution connection processes has a common session tableIngela Anderton Andin2021-02-0313-100/+214
| * | | | | | | | | | ssl: Update distribution supervisor treeIngela Anderton Andin2021-02-0313-62/+210
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ingela/ssl/deprecated-ciphers-function' into maintIngela Anderton Andin2021-02-032-14/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
View Lorry Controller Status