aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-06-14Merge branch 'ingela/public_key/merge-conflic-resolution'Ingela Anderton Andin
* ingela/public_key/merge-conflic-resolution: public_key: Add missing comma form merge commit 5268c7b957c30c31e551f197463cdd55a792ea69
2016-06-14public_key: Add missing comma form merge commit ↵Ingela Anderton Andin
5268c7b957c30c31e551f197463cdd55a792ea69
2016-06-14Merge branch 'egil/erts/fix-runnable_proc-race/OTP-13675'Björn-Egil Dahlberg
* egil/erts/fix-runnable_proc-race/OTP-13675: erts: Fix profile runnable processes race
2016-06-14Merge branch 'lukas/erts/etp-fixes'Lukas Larsson
* lukas/erts/etp-fixes: erts: Make etp-*-info take any value as input erts: Add etp commands to re-compile erlang
2016-06-14erts: Make etp-*-info take any value as inputLukas Larsson
2016-06-14Merge branch 'legoscia/ssl_crl_hash_dir-bis/PR-982/OTP-13530'Ingela Anderton Andin
* legoscia/ssl_crl_hash_dir-bis/PR-982/OTP-13530: Skip crl_hash_dir_expired test for LibreSSL Add ssl_crl_hash_dir module Function for generating OpenSSL-style name hashes Add public_key:pkix_match_dist_point Improve formatting for crl_{check,cache} options Add issuer arg to ssl_crl_cache_api lookup callback Conflicts: lib/public_key/test/public_key_SUITE.erl
2016-06-14erts: Add etp commands to re-compile erlangLukas Larsson
2016-06-14Merge branch 'lukas/erts/testfixes-19'Lukas Larsson
* lukas/erts/testfixes-19: erts: Increase bif and nif call_time trace test erts: Fix distribution_SUITE:bulk_send_bigbig on windows erts: Ensure bs_add_overflow test has enough memory kernel: Better explain controlling_process' tcp behaviour kernel: Fix t_recv_delim on bsd os_mon: Make sure to start/stop os_mon in tests correctly ssl: Fix use_interface dist_SSL test erl_interface: Fix signed int overflow tc bug erts: fix atom_roundtrip_r15b tc erts: Require more memory for debug tests
2016-06-14Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION lib/inets/vsn.mk lib/ssl/test/ssl_basic_SUITE.erl lib/ssl/vsn.mk
2016-06-14erts: Increase bif and nif call_time trace testLukas Larsson
This makes the time that the tests execute longer, which means that on systems with low resolution on timers (e.g. windows) the test is less likely to fail.
2016-06-14erts: Fix distribution_SUITE:bulk_send_bigbig on windowsLukas Larsson
The granualarity of the windows time sometimes makes timer:tc return 0 as the time taken for the test. Change this to use the most common time instead.
2016-06-14erts: Ensure bs_add_overflow test has enough memoryLukas Larsson
2016-06-14kernel: Better explain controlling_process' tcp behaviourLukas Larsson
2016-06-14kernel: Fix t_recv_delim on bsdLukas Larsson
TCP messages to not travel instantly on loopback on bsd, to we have to wait a little while for them to arrive.
2016-06-14os_mon: Make sure to start/stop os_mon in tests correctlyLukas Larsson
2016-06-14ssl: Fix use_interface dist_SSL testLukas Larsson
Doing inet:port will cause an port_control to be sent to the port, and not all ports in the vm can handle having arbitrary data sent to them.
2016-06-14Merge branch 'lukas/erl_interface/fix_long_windows/OTP-13673'Lukas Larsson
* lukas/erl_interface/fix_long_windows/OTP-13673: erl_interface: Fix trace level tracing on windows erl_interface: Fix decode_ulong on windows
2016-06-14erl_interface: Fix trace level tracing on windowsLukas Larsson
2016-06-14erl_interface: Fix decode_ulong on windowsLukas Larsson
2016-06-14erl_interface: Fix signed int overflow tc bugLukas Larsson
2016-06-14erts: fix atom_roundtrip_r15b tcLukas Larsson
if node fails to start, just skip testcase
2016-06-14Merge branch 'lukas/erts/xmllint-fixes/OTP-13672'Lukas Larsson
* lukas/erts/xmllint-fixes/OTP-13672: erts: Fix doc xml errors
2016-06-14erts: Fix doc xml errorsLukas Larsson
2016-06-14Merge branch 'peppe/common_test/OTP-13615'Peter Andersson
* peppe/common_test/OTP-13615: Fix problem with incorrect type of timestamps OTP-13615
2016-06-14Merge branch 'dotsimon/erts/heart_no_kill/OTP-13650'Lukas Larsson
* dotsimon/erts/heart_no_kill/OTP-13650: erts: Fix HEART_NO_KILL logic
2016-06-13erts: Fix profile runnable processes raceBjörn-Egil Dahlberg
2016-06-13Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
Add experimental debugging help in the code. Not used in normal cases.
2016-06-13ssh: add experimental test flagHans Nilsson
2016-06-13ssh: Additions to experimental ssh_dbg moduleHans Nilsson
- reorg - ssh_dbg:stop/0 - formating of send and receive debugging
2016-06-13Merge branch 'derek121/doc-function-list-ordering/PR-543/OTP-13668'Lars Thorsen
* derek121/doc-function-list-ordering/PR-543/OTP-13668: Sort functions in doc index frames
2016-06-13Merge branch 'kostis/xmerl-comment-out-unreachable-clauses/PR-1062'Lars Thorsen
* kostis/xmerl-comment-out-unreachable-clauses/PR-1062: xmerl: Comment out unreachable clauses
2016-06-13Merge branch 'dgud/test-cuddle'Dan Gudmundsson
* dgud/test-cuddle: Add test debug information and fix timing issues
2016-06-13Add test debug information and fix timing issuesDan Gudmundsson
2016-06-13Fix problem with incorrect type of timestampsPeter Andersson
OTP-13615
2016-06-13Updated OTP versionOTP-18.3.4Erlang/OTP
2016-06-13Update release notesErlang/OTP
2016-06-13Merge branch 'ingela/inets/clean-white-space/OTP-13663' into maint-18Erlang/OTP
* ingela/inets/clean-white-space/OTP-13663: inets: Prepare for release inets: Handle multiple \t in mime types file
2016-06-13Merge branch 'ingela/maint/ssl/max-session-table/OTP-13490' into maint-18Erlang/OTP
* ingela/maint/ssl/max-session-table/OTP-13490: ssl: Mitigate load increase when the whole session table is invalidated
2016-06-13Merge branch 'joedevivo/maint/ssl/PR-1063/OTP-13635' into maint-18Erlang/OTP
* joedevivo/maint/ssl/PR-1063/OTP-13635: ssl:recv timeout() can be 0
2016-06-13Merge branch 'ingela/maint/ssl/tls-1.2-available-hashsigns/OTP-13670' into ↵Erlang/OTP
maint-18 * ingela/maint/ssl/tls-1.2-available-hashsigns/OTP-13670: ssl: ordsets:intersection/2 did not give the expected result
2016-06-13Merge branch 'kennethlakin/maint/tls-use-negotiated-prf/PR-1042/OTP-13546' ↵Erlang/OTP
into maint-18 * kennethlakin/maint/tls-use-negotiated-prf/PR-1042/OTP-13546: ssl: Use cipher suite's PRF in prf/5
2016-06-13Merge branch 'ingela/ssl/maint-rel' into maint-18Erlang/OTP
* ingela/ssl/maint-rel: ssl: Prepare for release
2016-06-13ssl: Mitigate load increase when the whole session table is invalidatedIngela Anderton Andin
2016-06-13inets: Prepare for releaseIngela Anderton Andin
2016-06-13ssl: Prepare for releaseIngela Anderton Andin
2016-06-13Merge branch 'bjorn/stdlib/doc'Björn Gustavsson
* bjorn/stdlib/doc: Update STDLIB documentation
2016-06-13Update STDLIB documentationBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson and Hans Bolinder.
2016-06-13Merge branch 'hasse/stdlib/epp_long_file_names/OTP-13662'Hans Bolinder
* hasse/stdlib/epp_long_file_names/OTP-13662: stdlib: Let epp handle long file names
2016-06-13stdlib: Let epp handle long file namesHans Bolinder
2016-06-13Merge branch 'egil/erts/fix-undefined-shift/OTP-13665'Björn-Egil Dahlberg
* egil/erts/fix-undefined-shift/OTP-13665: erts: Fix undefined shift to msb in erl_process erts: Fix undefined shift to msb in monotonic time erts: Fix undefined shift to msb in erl_thr_progress erts: Fix undefined shift to msb in ethr_mutex