Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ssh: Add LibreSSL to compat tests | Hans Nilsson | 2018-01-25 | 2 | -14/+17 |
* | Merge branch 'hans/ssh/docker_compat_tests/OTP-14194' into maint | Hans Nilsson | 2018-01-09 | 28 | -1/+1202 |
|\ | |||||
| * | ssh: A compatibility testing suite using dockers | Hans Nilsson | 2018-01-08 | 28 | -1/+1202 |
* | | Merge branch 'siri/etop/include/ERL-534/OTP-14842' into maint | Siri Hansen | 2018-01-09 | 4 | -2/+17 |
|\ \ | |||||
| * | | [observer] Use include_lib instead of include with relative path | Siri Hansen | 2017-12-20 | 2 | -2/+2 |
| * | | Add runtime_tools/include to tertiary bootstrap | Siri Hansen | 2017-12-20 | 2 | -0/+15 |
* | | | Merge branch 'hasse/dialyzer/fix_abs/OTP-14858/ERL-551' into maint | Hans Bolinder | 2018-01-09 | 2 | -3/+12 |
|\ \ \ | |||||
| * | | | dialyzer: Correct handling of erlang:abs/1 | Hans Bolinder | 2018-01-08 | 2 | -3/+12 |
| | |/ | |/| | |||||
* | | | Merge branch 'siri/cdv/crash-when-truncated-in-mod-attr/ERL-537/OTP-14846' in... | Siri Hansen | 2018-01-09 | 2 | -4/+48 |
|\ \ \ | |||||
| * | | | [cdv] Don't crash when dump is truncated in module attributes | Siri Hansen | 2018-01-03 | 2 | -4/+48 |
* | | | | Merge branch 'ingela/dtls/test-cuddle' into maint | Ingela Anderton Andin | 2018-01-09 | 2 | -102/+24 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | dtls: Filter out rc4 for DTLS psk suites | Ingela Anderton Andin | 2018-01-07 | 2 | -10/+21 |
| * | | | dtls: We do not need to wait for DTLS over UDP server | Ingela Anderton Andin | 2018-01-06 | 1 | -92/+3 |
* | | | | Remove unsafe is_record/test_arity optimizations | John Högberg | 2018-01-04 | 2 | -18/+29 |
|/ / / | |||||
* | | | Merge branch 'ingela/ssl/error-handling-race/ERL-539/OTP-14852' into maint | Ingela Anderton Andin | 2018-01-04 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | ssl: Prevent error handling race condition | Ingela Anderton Andin | 2018-01-04 | 1 | -2/+4 |
* | | | | Merge PR-1664 from sverker/sverker/hipe-bs_put_utf8-gc-bug OTP-14850 | Sverker Eriksson | 2018-01-03 | 6 | -12/+20 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add PRIMOP_ABI_VSN to erts checksum | Sverker Eriksson | 2018-01-03 | 1 | -0/+7 |
| * | | | Fix bug in hipe primop bs_put_utf8 | Sverker Eriksson | 2018-01-03 | 5 | -12/+13 |
* | | | | Merge branch 'hans/ssh/cuddle_ssh_test' into maint | Hans Nilsson | 2017-12-22 | 7 | -22/+38 |
|\ \ \ \ | |||||
| * | | | | ssh: Better reports in some test case failures | Hans Nilsson | 2017-12-21 | 5 | -8/+10 |
| * | | | | ssh: Tests - timeout catches external ssh that does not disconnect | Hans Nilsson | 2017-12-21 | 5 | -14/+28 |
* | | | | | Merge branch 'hans/ssh/cuddle_ssh_dbg' into maint | Hans Nilsson | 2017-12-22 | 1 | -9/+29 |
|\ \ \ \ \ | |||||
| * | | | | | ssh: ssh_dbg updates | Hans Nilsson | 2017-12-21 | 1 | -9/+29 |
| |/ / / / | |||||
* | | | | | Merge branch 'hasse/cover/fix_counting/OTP-14817/PR-1641' into maint | Hans Bolinder | 2017-12-22 | 2 | -8/+38 |
|\ \ \ \ \ | |||||
| * | | | | | tools: Correct a counting bug in Cover | Hans Bolinder | 2017-12-21 | 2 | -8/+38 |
| |/ / / / | |||||
* | | | | | Merge remote-tracking branch 'origin/ingela/inets/remove-legacy-test-suite' i... | Ingela Anderton Andin | 2017-12-21 | 130 | -4602/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | inets: Remove old legacy SUITE | Ingela Anderton Andin | 2017-12-20 | 130 | -4602/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'sverker/cuddle-valgrind' into maint | Sverker Eriksson | 2017-12-21 | 4 | -9/+30 |
|\ \ \ \ | |||||
| * | | | | erts: Add core dumps from valgrind to z_SUITE search | Sverker Eriksson | 2017-12-13 | 1 | -0/+2 |
| * | | | | erts: Trim driver_SUITE:smp_select for slow valgrind | Sverker Eriksson | 2017-12-12 | 2 | -8/+14 |
| * | | | | kernel: Try fix/skip prim_file_SUITE:large_write for valgrind | Sverker Eriksson | 2017-12-12 | 1 | -1/+14 |
* | | | | | Merge pull request #1665 from shantiii/maint | Lukas Larsson | 2017-12-21 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix link to contribution guide in README.md | Shanti Chellaram | 2017-12-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'ingela/ssl/dtls-progress' into maint | Ingela Anderton Andin | 2017-12-20 | 1 | -3/+15 |
|\ \ \ \ | |||||
| * | | | | dtls: Add handling of lost key exchange in cipher state | Ingela Anderton Andin | 2017-12-20 | 1 | -0/+6 |
| * | | | | ssl: Correct DTLS client close handling | Ingela Anderton Andin | 2017-12-20 | 1 | -3/+9 |
|/ / / / | |||||
* | | | | Merge branch 'ingela/dtls-cuddling' into maint | Ingela Anderton Andin | 2017-12-20 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | dtls: Correct UDP listener cleanup | Ingela Anderton Andin | 2017-12-15 | 1 | -1/+4 |
| * | | | | dtls: Correct return value in UDP listener initialization | Ingela Anderton Andin | 2017-12-15 | 1 | -1/+1 |
* | | | | | Merge branch 'ingela/DTLS/retransmission-timers' into maint | Ingela Anderton Andin | 2017-12-20 | 1 | -8/+10 |
|\ \ \ \ \ | |||||
| * | | | | | dtls: Use repeat_state to make sure retransmission timer is reset | Ingela Anderton Andin | 2017-12-18 | 1 | -8/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ingela/Jxck/PR-1656/OTP-14843' into maint | Ingela Anderton Andin | 2017-12-20 | 1 | -1/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | remove duplicate operation for decode certificate | Jxck | 2017-12-19 | 1 | -1/+0 |
* | | | | | Merge pull request #1660 from bitnitdit/ssl_doc_duplicate_word | Ingela Andin | 2017-12-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove one of the duplicate word "use" | bitnitdit | 2017-12-19 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint-20' into maint | Dan Gudmundsson | 2017-12-19 | 5 | -5/+32 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Updated OTP versionOTP-20.2.2 | Erlang/OTP | 2017-12-18 | 2 | -1/+2 |
| * | | | | | Prepare release | Erlang/OTP | 2017-12-18 | 2 | -2/+28 |
| * | | | | | Merge branch 'dgud/mnesia/checkpoint-crash/OTP-14841' into maint-20 | Erlang/OTP | 2017-12-18 | 1 | -2/+2 |
| |\ \ \ \ \ |