aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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-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
2016-06-13Merge branch 'egil/erl_interface/fix-decode-longlong/ERL-158/OTP-13666'Björn-Egil Dahlberg
* egil/erl_interface/fix-decode-longlong/ERL-158/OTP-13666: Fix decoding of LLONG_MIN in erl_decode
2016-06-13Fix decoding of LLONG_MIN in erl_decodeBjörn-Egil Dahlberg
Reported-by: Peter Lemenkov
2016-06-13Update primary bootstrapBjörn Gustavsson
2016-06-13Merge branch 'bjorn/stdlib/deprecate-queue-lait/OTP-13658'Björn Gustavsson
* bjorn/stdlib/deprecate-queue-lait/OTP-13658: Deprecate queue:lait/1
2016-06-12Merge branch 'anders/diameter/rand/OTP-13664'Anders Svensson
* anders/diameter/rand/OTP-13664: Use rand(3) instead of random(3)
2016-06-12Merge branch 'anders/diameter/19/listen/OTP-13611'Anders Svensson
* anders/diameter/19/listen/OTP-13611: Fix testsuite match blunder Remove unnecessary no_auto_import Redo transport config server as a gen_server
2016-06-11Fix testsuite match blunderAnders Svensson
That missed comm_up when something like the following was received on FreeBSD (for one): {sctp,#Port<0.599>, {127,0,0,1}, 45455, {[{sctp_sndrcvinfo,0,0,[],0,0,0,0,145060462,3}], {sctp_assoc_change,comm_up,0,10,10,3}}}
2016-06-11Use rand(3) instead of random(3)Anders Svensson
The latter is deprecated in OTP 19.
2016-06-11Remove unnecessary no_auto_importAnders Svensson
Not difficult to avoid, and better without.
2016-06-11Redo transport config server as a gen_serverAnders Svensson
To properly handle system messages. Initially implemented in commit 5ca5fb71.
2016-06-11Merge branch 'anders/diameter/19/listen/OTP-13611'Anders Svensson
* anders/diameter/19/listen/OTP-13611: Fix leaking transports in traffic/relay suites Close listening sockets at transport removal Don't restart transport processes after transport removal Rename diameter_reg:del -> remove Add diameter_reg:subscribe/2 Add dialyzer specs to diameter_reg Remove diameter_reg:repl/2 Remove diameter_reg bloat
2016-06-10erts: Fix undefined shift to msb in erl_processBjörn-Egil Dahlberg
2016-06-10erts: Fix undefined shift to msb in monotonic timeBjörn-Egil Dahlberg
2016-06-10erts: Fix undefined shift to msb in erl_thr_progressBjörn-Egil Dahlberg
2016-06-10erts: Fix undefined shift to msb in ethr_mutexBjörn-Egil Dahlberg
2016-06-10Deprecate queue:lait/1Björn Gustavsson
2016-06-10Merge branch 'egil/erts/fix-xmllint'Björn-Egil Dahlberg
* egil/erts/fix-xmllint: erts: Fix erl_nif.xml xmllint errors
2016-06-10Merge branch 'shezarkhani/mnesia/doc-fix/PR-1093'Dan Gudmundsson
* shezarkhani/mnesia/doc-fix/PR-1093: Fixes minor documentation error.