Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rickard/ei-ext-maint/OTP-15442' into maint | Rickard Green | 2019-02-06 | 20 | -59/+205 |
|\ | |||||
| * | Merge branch 'rickard/ei-ext/OTP-15442' into rickard/ei-ext-maint/OTP-15442 | Rickard Green | 2019-02-05 | 20 | -59/+205 |
| |\ | |||||
| | * | Introduce ei_init() | Rickard Green | 2019-02-05 | 19 | -49/+193 |
| | * | Fix bug in ei_accept_tmo | Rickard Green | 2019-02-04 | 2 | -2/+1 |
| | * | Fix build of erl_interface on BSD | Rickard Green | 2019-01-29 | 3 | -8/+11 |
* | | | Merge branch 'sverker/fix-compile-warning' into maint | Sverker Eriksson | 2019-02-06 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | erts: Fix compiler warning for IS_SSMALL | Sverker Eriksson | 2019-01-30 | 1 | -1/+5 |
* | | | | Merge branch 'ingela/ssl/alert-return/OTP-15423' into maint | Ingela Anderton Andin | 2019-02-05 | 41 | -1158/+1702 |
|\ \ \ \ | |||||
| * | | | | ssl: Use specs to generate type documentation | Ingela Anderton Andin | 2019-02-05 | 34 | -1007/+1542 |
| * | | | | ssl: Enhance error handling | Ingela Anderton Andin | 2019-02-04 | 9 | -151/+160 |
* | | | | | Merge branch 'ingela/ssl/dtls-match-error/OTP-15561' into maint | Ingela Anderton Andin | 2019-02-05 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | ssl: Remove unintended match | Ingela Anderton Andin | 2019-02-01 | 1 | -2/+2 |
* | | | | | | Merge branch 'lukas/erts/cerl-etp-rr-support' into maint | Lukas Larsson | 2019-02-05 | 4 | -8/+101 |
|\ \ \ \ \ \ | |||||
| * | | | | | | erts: Expand rr support in cerl and etp | Lukas Larsson | 2019-02-05 | 4 | -8/+101 |
* | | | | | | | Merge branch 'maint-21' into maint | Péter Dimitrov | 2019-02-04 | 5 | -7/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updated OTP versionOTP-21.2.5 | Erlang/OTP | 2019-02-01 | 2 | -1/+2 |
| * | | | | | | | Prepare release | Erlang/OTP | 2019-02-01 | 3 | -6/+25 |
| * | | | | | | | Merge branch 'peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554' into maint-21 | Erlang/OTP | 2019-02-01 | 1 | -7/+5 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'peterdmv/inets/fix-http-client/ERIERL-289/OTP-15554' into maint | Péter Dimitrov | 2019-02-04 | 1 | -7/+5 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | inets: Ignore bracket option in format_address | Péter Dimitrov | 2019-02-01 | 1 | -7/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #2128 from amatalai/fix-typo-in-erlang-xml | Lukas Larsson | 2019-02-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix typo in erlang.xml | Tobiasz | 2019-02-04 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2117 from essen/fix-erl_epmd_port_please-spec/OTP-15557 | Lukas Larsson | 2019-02-01 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix spec for erl_epmd:port_please | Loïc Hoguin | 2019-01-29 | 1 | -4/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'lukas/erts/fix_system_info_kernelpoll/OTP-15556' into maint | Lukas Larsson | 2019-02-01 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | erts: Fix erlang:system_info(kernel_poll) to return correct value | Lukas Larsson | 2019-02-01 | 2 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | fix: erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS code | Lukas Larsson | 2019-02-01 | 1 | -36/+0 |
* | | | | | | Merge branch 'lukas/OTP-21.3-cleanup' into maint | Lukas Larsson | 2019-02-01 | 2 | -369/+11 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | erl_interface: Fix bsd makefile problem | Lukas Larsson | 2019-02-01 | 1 | -2/+1 |
| * | | | | | erts: Remove dead ERTS_MAGIC_REF_BIF_TIMERS code | Lukas Larsson | 2019-02-01 | 1 | -367/+10 |
|/ / / / / | |||||
* | | | | | Merge branch 'sverker/port-control-badarg/OTP-15555' into maint | Sverker Eriksson | 2019-01-31 | 13 | -15/+68 |
|\ \ \ \ \ | |||||
| * | | | | | erts: Add doc warnings for erlang:port_command|call|control | Sverker Eriksson | 2019-01-28 | 1 | -2/+26 |
| * | | | | | erts: Add magic port control numbers | Sverker Eriksson | 2019-01-28 | 12 | -13/+42 |
* | | | | | | Merge pull request #2119 from bjorng/bjorn/compiler/tuple-call/ERL-838/OTP-15552 | Björn Gustavsson | 2019-01-31 | 2 | -3/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Eliminate bogus warning when using tuple calls | Björn Gustavsson | 2019-01-30 | 2 | -3/+19 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2109 from IngelaAndin/ingela/ssl/active-check | Ingela Andin | 2019-01-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ssl: Correct check for delayed close due to undliverd data | Ingela Anderton Andin | 2019-01-24 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'peterdmv/ssl/improve_openssl_interop_tests' into maint | Péter Dimitrov | 2019-01-30 | 2 | -39/+64 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | ssl: Improve openssl interop tests | Péter Dimitrov | 2019-01-29 | 2 | -39/+64 |
* | | | | | | Merge branch 'hans/ssh/cuddle_bench' into maint | Hans Nilsson | 2019-01-25 | 1 | -25/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ssh: Internal refactor and ct:log -> ct:pal | Hans Nilsson | 2019-01-25 | 1 | -25/+22 |
| * | | | | | | ssh: Change unit in measurements | Hans Nilsson | 2019-01-25 | 1 | -2/+2 |
| * | | | | | | ssh: Invert ssh_bench | Hans Nilsson | 2019-01-25 | 1 | -6/+7 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'hans/crypto/bench/OTP-15447' into maint | Hans Nilsson | 2019-01-25 | 1 | -25/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | crypto: Reorg | Hans Nilsson | 2019-01-25 | 1 | -18/+31 |
| * | | | | | | crypto: Misc fixes: double time, calibrate once | Hans Nilsson | 2019-01-25 | 1 | -10/+10 |
|/ / / / / / | |||||
* | | | | | | Update version-check of forward merging script | Lukas Larsson | 2019-01-25 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint-21' into maint | Lukas Larsson | 2019-01-25 | 7 | -4/+74 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Updated OTP versionOTP-21.2.4 | Erlang/OTP | 2019-01-24 | 2 | -1/+2 |
| * | | | | | Prepare release | Erlang/OTP | 2019-01-24 | 5 | -10/+72 |