summaryrefslogtreecommitdiff
path: root/erts
Commit message (Expand)AuthorAgeFilesLines
* Prepare releaseErlang/OTP2020-12-112-1/+96
* Merge pull request #2907 from dgud/dgud/otp/win-manifestDan Gudmundsson2020-12-095-16/+25
|\
| * Add a default manifest for windowsDan Gudmundsson2020-12-035-16/+25
* | Merge branch 'maint-22' into maintMicael Karlberg2020-12-071-0/+17
|\ \
| * | Prepare releaseErlang/OTP2020-12-042-1/+18
| * | Merge branch 'sverker/22/dist-lock-bug/ERL-1337/OTP-16869' into maint-22Erlang/OTP2020-12-045-29/+63
| |\ \
* | \ \ Merge pull request #2908 from bjorng/bjorn/erts/fix-unlimited-files/ERL-1417/...Björn Gustavsson2020-12-071-0/+15
|\ \ \ \
| * | | | Don't crash if the number of file descriptors is unlimitedBjörn Gustavsson2020-12-041-0/+15
* | | | | Merge branch 'bmk/esock/20201127/move_esock_test_tools' into maintMicael Karlberg2020-12-0411-2487/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [erts|kernel|esock|test] Moved esock test tools from emulator to kernelMicael Karlberg2020-11-2711-2487/+0
* | | | | Merge branch 'sverker/erts/nif_SUITE-nif_ioq-fix' into maintSverker Eriksson2020-12-021-10/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | erts: Robustify test nif_SUITE:ioq_nifSverker Eriksson2020-11-231-9/+9
| * | | | erts: Fix test bug in nif_SUITE:nif_ioqSverker Eriksson2020-11-231-1/+1
* | | | | Correct error handling for list_to_integer/2Björn Gustavsson2020-11-272-24/+33
| |/ / / |/| | |
* | | | make_driver_tab: also strip .gprof marker from static archiveMikael Pettersson2020-11-191-0/+1
|/ / /
* | | Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson2020-11-181-1/+30
|\ \ \
| * | | crypto: Fix problems for compiler test suiteHans Nilsson2020-11-091-5/+0
| * | | crypto: Suppress valgrind errors at NIF loadingHans Nilsson2020-11-021-1/+35
* | | | Merge branch 'maint-23' into maintHans Nilsson2020-11-172-1/+16
|\ \ \ \
| * | | | Prepare releaseErlang/OTP2020-11-172-1/+16
| * | | | Merge branch 'john/erts/fix-next_catch-tracing/OTP-16994' into maint-23Erlang/OTP2020-11-172-20/+30
| |\ \ \ \
* | \ \ \ \ Merge branch 'bmk/kernel/20201026/resolver_query_retry_timeout/OTP-16956' int...Micael Karlberg2020-11-121-1/+12
|\ \ \ \ \ \
| * | | | | | [kernel|erts] Add text about the new resolver config optionMicael Karlberg2020-10-261-1/+12
* | | | | | | Merge branch 'sverker/nif-call-env-doc/ERL-1399' into maintSverker Eriksson2020-11-101-19/+39
|\ \ \ \ \ \ \
| * | | | | | | erts: Clarify 'caller_env' arguments in erl_nif_docSverker Eriksson2020-11-041-19/+39
* | | | | | | | Merge pull request #2856 from rnshah9/patch-5Lukas Larsson2020-11-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Typo fix in escript_cmdRaj Shah2020-11-081-1/+1
* | | | | | | | | Merge branch 'john/erts/fix-next_catch-tracing/OTP-16994' into maintJohn Högberg2020-11-092-20/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | erts: Fix exception handling during tracingJohn Högberg2020-11-052-20/+30
* | | | | | | | Merge branch 'maint-23' into maintRickard Green2020-11-052-1/+51
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Prepare releaseErlang/OTP2020-11-052-1/+51
| * | | | | | | Merge branch 'rickard/dist-spawn_request-badopt/OTP-16991' into maint-23Erlang/OTP2020-11-052-1/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rickard/iov-fixes/OTP-16955/ERL-1343' into maint-23Erlang/OTP2020-11-052-5/+78
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rickard/small-memory-build-fix/OTP-16939' into maint-23Erlang/OTP2020-11-051-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rickard/dist-spawn_request-badopt/OTP-16991' into maintRickard Green2020-11-042-1/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix bad 'reply' option to distributed spawn_request()Rickard Green2020-11-032-1/+11
| |/ / / / / / /
* | | | | | | | Typo fix in escript_cmdRaj Shah2020-11-021-1/+1
* | | | | | | | Merge 'sverker/23/dist-lock-bug/ERL-1337/OTP-16869' into maintSverker Eriksson2020-10-287-46/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | erts: Make sure failed replies are sent on same dist connectionSverker Eriksson2020-10-261-4/+6
| * | | | | | | | erts: Fix race on ErtsMonLnkDist for spawn_request as wellSverker Eriksson2020-10-263-13/+23
| * | | | | | | | Merge 'sverker/22/dist-lock-bug/ERL-1337/OTP-16869'Sverker Eriksson2020-10-265-29/+63
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge 'sverker/21/dist-lock-bug/ERL-1337/OTP-16869'Sverker Eriksson2020-10-265-29/+63
| | |\ \ \ \ \ \ \
| | | * | | | | | | erts: Fix race on ErtsMonLnkDist in erts_net_messageSverker Eriksson2020-10-235-35/+63
* | | | | | | | | | Merge branch 'rickard/iov-fixes/OTP-16955/ERL-1343' into maintRickard Green2020-10-282-5/+78
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Look up IOV_MAX instead of assuming 16Rickard Green2020-10-222-5/+78
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'maint-22' into maintIngela Anderton Andin2020-10-201-0/+17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Prepare releaseErlang/OTP2020-10-192-1/+18
| * | | | | | | Merge branch 'rickard/small-memory-build-fix/OTP-16939' into maint-22Erlang/OTP2020-10-191-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Merge pull request #2792 from mikpe/read_file-rename-raceJohn Högberg2020-10-191-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | fix race with rename in read_file_nif(), add test caseMikael Pettersson2020-10-091-2/+6
| | |_|_|_|_|_|/ | |/| | | | | |