summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rickard/ei-ext-maint/OTP-15442' into maintRickard Green2019-02-0620-59/+205
|\
| * Merge branch 'rickard/ei-ext/OTP-15442' into rickard/ei-ext-maint/OTP-15442Rickard Green2019-02-0520-59/+205
| |\
| | * Introduce ei_init()Rickard Green2019-02-0519-49/+193
| | * Fix bug in ei_accept_tmoRickard Green2019-02-042-2/+1
| | * Fix build of erl_interface on BSDRickard Green2019-01-293-8/+11
* | | Merge branch 'sverker/fix-compile-warning' into maintSverker Eriksson2019-02-061-1/+5
|\ \ \
| * | | erts: Fix compiler warning for IS_SSMALLSverker Eriksson2019-01-301-1/+5
* | | | Merge branch 'ingela/ssl/alert-return/OTP-15423' into maintIngela Anderton Andin2019-02-0541-1158/+1702
|\ \ \ \
| * | | | ssl: Use specs to generate type documentationIngela Anderton Andin2019-02-0534-1007/+1542
| * | | | ssl: Enhance error handlingIngela Anderton Andin2019-02-049-151/+160
* | | | | Merge branch 'ingela/ssl/dtls-match-error/OTP-15561' into maintIngela Anderton Andin2019-02-051-2/+2
|\ \ \ \ \
| * | | | | ssl: Remove unintended matchIngela Anderton Andin2019-02-011-2/+2
* | | | | | Merge branch 'lukas/erts/cerl-etp-rr-support' into maintLukas Larsson2019-02-054-8/+101
|\ \ \ \ \ \
| * | | | | | erts: Expand rr support in cerl and etpLukas Larsson2019-02-054-8/+101
* | | | | | | Merge branch 'maint-21' into maintPéter Dimitrov2019-02-045-7/+27
|\ \ \ \ \ \ \
| * | | | | | | Updated OTP versionOTP-21.2.5Erlang/OTP2019-02-012-1/+2
| * | | | | | | Prepare releaseErlang/OTP2019-02-013-6/+25
| * | | | | | | Merge branch 'peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554' into maint-21Erlang/OTP2019-02-011-7/+5
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554' into maintPéter Dimitrov2019-02-041-7/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | inets: Ignore bracket option in format_addressPéter Dimitrov2019-02-011-7/+5
| |/ / / / / /
* | | | | | | Merge pull request #2128 from amatalai/fix-typo-in-erlang-xmlLukas Larsson2019-02-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in erlang.xmlTobiasz2019-02-041-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #2117 from essen/fix-erl_epmd_port_please-spec/OTP-15557Lukas Larsson2019-02-011-4/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix spec for erl_epmd:port_pleaseLoïc Hoguin2019-01-291-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'lukas/erts/fix_system_info_kernelpoll/OTP-15556' into maintLukas Larsson2019-02-012-2/+2
|\ \ \ \ \ \
| * | | | | | erts: Fix erlang:system_info(kernel_poll) to return correct valueLukas Larsson2019-02-012-2/+2
|/ / / / / /
* | | | | | fix: erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS codeLukas Larsson2019-02-011-36/+0
* | | | | | Merge branch 'lukas/OTP-21.3-cleanup' into maintLukas Larsson2019-02-012-369/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | erl_interface: Fix bsd makefile problemLukas Larsson2019-02-011-2/+1
| * | | | | erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS codeLukas Larsson2019-02-011-367/+10
|/ / / / /
* | | | | Merge branch 'sverker/port-control-badarg/OTP-15555' into maintSverker Eriksson2019-01-3113-15/+68
|\ \ \ \ \
| * | | | | erts: Add doc warnings for erlang:port_command|call|controlSverker Eriksson2019-01-281-2/+26
| * | | | | erts: Add magic port control numbersSverker Eriksson2019-01-2812-13/+42
* | | | | | Merge pull request #2119 from bjorng/bjorn/compiler/tuple-call/ERL-838/OTP-15552Björn Gustavsson2019-01-312-3/+19
|\ \ \ \ \ \
| * | | | | | Eliminate bogus warning when using tuple callsBjörn Gustavsson2019-01-302-3/+19
|/ / / / / /
* | | | | | Merge pull request #2109 from IngelaAndin/ingela/ssl/active-checkIngela Andin2019-01-301-0/+1
|\ \ \ \ \ \
| * | | | | | ssl: Correct check for delayed close due to undliverd dataIngela Anderton Andin2019-01-241-0/+1
| |/ / / / /
* | | | | | Merge branch 'peterdmv/ssl/improve_openssl_interop_tests' into maintPéter Dimitrov2019-01-302-39/+64
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | ssl: Improve openssl interop testsPéter Dimitrov2019-01-292-39/+64
* | | | | | Merge branch 'hans/ssh/cuddle_bench' into maintHans Nilsson2019-01-251-25/+23
|\ \ \ \ \ \
| * | | | | | ssh: Internal refactor and ct:log -> ct:palHans Nilsson2019-01-251-25/+22
| * | | | | | ssh: Change unit in measurementsHans Nilsson2019-01-251-2/+2
| * | | | | | ssh: Invert ssh_benchHans Nilsson2019-01-251-6/+7
|/ / / / / /
* | | | | | Merge branch 'hans/crypto/bench/OTP-15447' into maintHans Nilsson2019-01-251-25/+38
|\ \ \ \ \ \
| * | | | | | crypto: ReorgHans Nilsson2019-01-251-18/+31
| * | | | | | crypto: Misc fixes: double time, calibrate onceHans Nilsson2019-01-251-10/+10
|/ / / / / /
* | | | | | Update version-check of forward merging scriptLukas Larsson2019-01-251-1/+1
* | | | | | Merge branch 'maint-21' into maintLukas Larsson2019-01-257-4/+74
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Updated OTP versionOTP-21.2.4Erlang/OTP2019-01-242-1/+2
| * | | | | Prepare releaseErlang/OTP2019-01-245-10/+72