summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ssh: Add LibreSSL to compat testsHans Nilsson2018-01-252-14/+17
* Merge branch 'hans/ssh/docker_compat_tests/OTP-14194' into maintHans Nilsson2018-01-0928-1/+1202
|\
| * ssh: A compatibility testing suite using dockersHans Nilsson2018-01-0828-1/+1202
* | Merge branch 'siri/etop/include/ERL-534/OTP-14842' into maintSiri Hansen2018-01-094-2/+17
|\ \
| * | [observer] Use include_lib instead of include with relative pathSiri Hansen2017-12-202-2/+2
| * | Add runtime_tools/include to tertiary bootstrapSiri Hansen2017-12-202-0/+15
* | | Merge branch 'hasse/dialyzer/fix_abs/OTP-14858/ERL-551' into maintHans Bolinder2018-01-092-3/+12
|\ \ \
| * | | dialyzer: Correct handling of erlang:abs/1Hans Bolinder2018-01-082-3/+12
| | |/ | |/|
* | | Merge branch 'siri/cdv/crash-when-truncated-in-mod-attr/ERL-537/OTP-14846' in...Siri Hansen2018-01-092-4/+48
|\ \ \
| * | | [cdv] Don't crash when dump is truncated in module attributesSiri Hansen2018-01-032-4/+48
* | | | Merge branch 'ingela/dtls/test-cuddle' into maintIngela Anderton Andin2018-01-092-102/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | dtls: Filter out rc4 for DTLS psk suitesIngela Anderton Andin2018-01-072-10/+21
| * | | dtls: We do not need to wait for DTLS over UDP serverIngela Anderton Andin2018-01-061-92/+3
* | | | Remove unsafe is_record/test_arity optimizationsJohn Högberg2018-01-042-18/+29
|/ / /
* | | Merge branch 'ingela/ssl/error-handling-race/ERL-539/OTP-14852' into maintIngela Anderton Andin2018-01-041-2/+4
|\ \ \
| * | | ssl: Prevent error handling race conditionIngela Anderton Andin2018-01-041-2/+4
* | | | Merge PR-1664 from sverker/sverker/hipe-bs_put_utf8-gc-bug OTP-14850Sverker Eriksson2018-01-036-12/+20
|\ \ \ \ | |_|/ / |/| | |
| * | | Add PRIMOP_ABI_VSN to erts checksumSverker Eriksson2018-01-031-0/+7
| * | | Fix bug in hipe primop bs_put_utf8Sverker Eriksson2018-01-035-12/+13
* | | | Merge branch 'hans/ssh/cuddle_ssh_test' into maintHans Nilsson2017-12-227-22/+38
|\ \ \ \
| * | | | ssh: Better reports in some test case failuresHans Nilsson2017-12-215-8/+10
| * | | | ssh: Tests - timeout catches external ssh that does not disconnectHans Nilsson2017-12-215-14/+28
* | | | | Merge branch 'hans/ssh/cuddle_ssh_dbg' into maintHans Nilsson2017-12-221-9/+29
|\ \ \ \ \
| * | | | | ssh: ssh_dbg updatesHans Nilsson2017-12-211-9/+29
| |/ / / /
* | | | | Merge branch 'hasse/cover/fix_counting/OTP-14817/PR-1641' into maintHans Bolinder2017-12-222-8/+38
|\ \ \ \ \
| * | | | | tools: Correct a counting bug in CoverHans Bolinder2017-12-212-8/+38
| |/ / / /
* | | | | Merge remote-tracking branch 'origin/ingela/inets/remove-legacy-test-suite' i...Ingela Anderton Andin2017-12-21130-4602/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | inets: Remove old legacy SUITEIngela Anderton Andin2017-12-20130-4602/+0
| | |/ / | |/| |
* | | | Merge branch 'sverker/cuddle-valgrind' into maintSverker Eriksson2017-12-214-9/+30
|\ \ \ \
| * | | | erts: Add core dumps from valgrind to z_SUITE searchSverker Eriksson2017-12-131-0/+2
| * | | | erts: Trim driver_SUITE:smp_select for slow valgrindSverker Eriksson2017-12-122-8/+14
| * | | | kernel: Try fix/skip prim_file_SUITE:large_write for valgrindSverker Eriksson2017-12-121-1/+14
* | | | | Merge pull request #1665 from shantiii/maintLukas Larsson2017-12-211-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix link to contribution guide in README.mdShanti Chellaram2017-12-211-1/+1
|/ / / /
* | | | Merge branch 'ingela/ssl/dtls-progress' into maintIngela Anderton Andin2017-12-201-3/+15
|\ \ \ \
| * | | | dtls: Add handling of lost key exchange in cipher stateIngela Anderton Andin2017-12-201-0/+6
| * | | | ssl: Correct DTLS client close handlingIngela Anderton Andin2017-12-201-3/+9
|/ / / /
* | | | Merge branch 'ingela/dtls-cuddling' into maintIngela Anderton Andin2017-12-201-2/+5
|\ \ \ \
| * | | | dtls: Correct UDP listener cleanupIngela Anderton Andin2017-12-151-1/+4
| * | | | dtls: Correct return value in UDP listener initializationIngela Anderton Andin2017-12-151-1/+1
* | | | | Merge branch 'ingela/DTLS/retransmission-timers' into maintIngela Anderton Andin2017-12-201-8/+10
|\ \ \ \ \
| * | | | | dtls: Use repeat_state to make sure retransmission timer is resetIngela Anderton Andin2017-12-181-8/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'ingela/Jxck/PR-1656/OTP-14843' into maintIngela Anderton Andin2017-12-201-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | remove duplicate operation for decode certificateJxck2017-12-191-1/+0
* | | | | Merge pull request #1660 from bitnitdit/ssl_doc_duplicate_wordIngela Andin2017-12-191-1/+1
|\ \ \ \ \
| * | | | | Remove one of the duplicate word "use"bitnitdit2017-12-191-1/+1
* | | | | | Merge branch 'maint-20' into maintDan Gudmundsson2017-12-195-5/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updated OTP versionOTP-20.2.2Erlang/OTP2017-12-182-1/+2
| * | | | | Prepare releaseErlang/OTP2017-12-182-2/+28
| * | | | | Merge branch 'dgud/mnesia/checkpoint-crash/OTP-14841' into maint-20Erlang/OTP2017-12-181-2/+2
| |\ \ \ \ \