aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-06-10Merge branch 'maint'Siri Hansen
2019-06-10Merge branch 'siri/ct/hook-terminated-not-initiated/ERIERL-370/OTP-15863' ↵Siri Hansen
into maint * siri/ct/hook-terminated-not-initiated/ERIERL-370/OTP-15863: [ct] Fix bug where Hook:terminate/1 was called before Hook:init/2
2019-06-10Merge branch 'maint'Ingela Anderton Andin
2019-06-10Merge branch 'ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864' into maintIngela Anderton Andin
* ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864: ssl: Add missing gen_server return value in DTLS packet demux process
2019-06-07ssl: Add missing gen_server return value in DTLS packet demux processIngela Anderton Andin
2019-06-05Let pre-push hook detect when it needs an upgradeSverker Eriksson
after a master release.
2019-06-05Merge branch 'maint'Siri Hansen
2019-06-05Merge branch 'siri/logger/relatve-log-file-path/OTP-15850' into maintSiri Hansen
* siri/logger/relatve-log-file-path/OTP-15850: [logger] Store file name as absolute path in logger_std_h
2019-06-05Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Correct indentation of field warnings
2019-06-05Merge branch 'hasse/dialyzer/fix_string_split/OTP-15861/ERL-953' into maintHans Bolinder
* hasse/dialyzer/fix_string_split/OTP-15861/ERL-953: dialyzer: Correct indentation of field warnings
2019-06-05Merge branch 'maint'Ingela Anderton Andin
2019-06-05Merge branch 'ingela/ssl/ret-ext/ERL-951/OTP-15862' into maintIngela Anderton Andin
* ingela/ssl/ret-ext/ERL-951/OTP-15862: ssl: Fix broken return value
2019-06-05ssl: Fix broken return valueIngela Anderton Andin
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge branch 'ingela/ssl/22/alert-strings/OTP-15844' into maintIngela Anderton Andin
* ingela/ssl/22/alert-strings/OTP-15844: ssl: Returned "alert error string" should be same as logged alert string
2019-06-04ssl: Returned "alert error string" should be same as logged alert stringIngela Anderton Andin
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge branch 'ingela/ssl/PR-2235/OTP-15851' into maintIngela Anderton Andin
* ingela/ssl/PR-2235/OTP-15851: Export sign_scheme/0 types
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge pull request #2268 from IngelaAndin/ingela/ssl/DTLS-version-check/ERL-920Ingela Andin
ssl: Change check of DTLS record version OTP-15807 Merged as it is an confirmed improvement, however more work needs to be done on DTLS test framework.
2019-06-04[ct] Fix bug where Hook:terminate/1 was called before Hook:init/2Siri Hansen
This problem was introduced with commit acd87425acf7705328b01aa8f0a804207ffe4790, when the new hook function post_groups/2 and post_all/3 were added.
2019-06-04dialyzer: Correct indentation of field warningsHans Bolinder
See also https://bugs.erlang.org/browse/ERL-953.
2019-06-04Merge branch 'maint'Ingela Anderton Andin
2019-06-04Merge pull request #2269 from IngelaAndin/ingela/ssl/ret-ext/ERL-951Ingela Andin
ssl: Fix broken return value OTP-15862
2019-06-04Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release
2019-06-04Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/src/kernel.appup.src # lib/kernel/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/src/stdlib.appup.src # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-03Merge branch 'maint'Hans Bolinder
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
2019-06-03Merge branch 'maint-22' into maintHans Bolinder
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-03Merge branch 'maint'Björn Gustavsson
* maint: Teach ei_print_term() to print funs Teach ei_print_term() to print maps Correct decoding of old funs (FUN_EXT) Correct decoding of external funs
2019-06-03Updated OTP versionOTP-21.3.8.3Erlang/OTP
2019-06-03Prepare releaseErlang/OTP
2019-06-03Merge branch ↵Erlang/OTP
'sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849/OTP-15858/OTP-15859' into maint-21 * sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849/OTP-15858/OTP-15859: erts: Fix faulty spec for seq_trace:set_token/2 erts: Fix seq_trace:print/2 for arbitrary labels erts: Fix bug in seq_trace:set_token(label,_)
2019-06-03Merge branch 'hasse/stdlib/chars_limit_bug/OTP-15847/ERL-957' into maint-21Erlang/OTP
* hasse/stdlib/chars_limit_bug/OTP-15847/ERL-957: stdlib: Fix a bug concerning io_lib option 'chars_limit'
2019-06-03Merge branch 'ingela/ssl/alert-strings/OTP-15844' into maint-21Erlang/OTP
* ingela/ssl/alert-strings/OTP-15844: Export named_curve/0 ssl: Export type that user may want to use ssl: Returned "alert error string" should be same as logged alert string
2019-06-03Merge branch 'bjorn/erts/fix-wrong-class/ERIERL-367/OTP-15834' into maint-21Erlang/OTP
* bjorn/erts/fix-wrong-class/ERIERL-367/OTP-15834: Fix sticky class in exception
2019-06-03Merge pull request #2246 from bjorng/bjorn/erl_interface/term-printing/OTP-15814Björn Gustavsson
Support printing of maps and funs in ei_print_term()
2019-05-31ssl: Fix broken return valueIngela Anderton Andin
2019-05-29ssl: Change check of DTLS record versionIngela Anderton Andin
Retransmissions mechanism for upd makes it possible for handshakes and possible alerts to have another record version then the negotiated one in the states certify and abbreviated without beeing invalid messages.
2019-05-29Merge branch 'maint'Sverker Eriksson
2019-05-29Merge branch 'sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849' into maintSverker Eriksson
* sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849: erts: Fix faulty spec for seq_trace:set_token/2 erts: Fix seq_trace:print/2 for arbitrary labels erts: Fix bug in seq_trace:set_token(label,_)
2019-05-29Teach ei_print_term() to print funsBjörn Gustavsson
2019-05-29Teach ei_print_term() to print mapsBjörn Gustavsson
2019-05-29Correct decoding of old funs (FUN_EXT)Björn Gustavsson
If the environment is empty, don't access the free_vars pointer and don't allocate a zero-size buffer. Better safe than sorry.
2019-05-29Merge branch 'maint'Hans Bolinder
* maint: stdlib: Fix a bug concerning io_lib option 'chars_limit'
2019-05-29Merge branch 'hasse/stdlib/chars_limit_bug/OTP-15847/ERL-957' into maintHans Bolinder
* hasse/stdlib/chars_limit_bug/OTP-15847/ERL-957: stdlib: Fix a bug concerning io_lib option 'chars_limit'
2019-05-29Merge branch 'maint'Micael Karlberg
2019-05-29Merge branch 'bmk/erts/esock/20190529/unix_domain_socket/OTP-15822' into maintMicael Karlberg
2019-05-29[esock|test] Add condition for running ping pong test caseMicael Karlberg
Add condition for running the large ping-pong sendmsg/recvmsg test case. Also add a limit to the path creation (max number of tries). OTP-15822
2019-05-29[esock|ttest] Make it possible use local for ttestMicael Karlberg
Make Unix Domain (stream) socket work with the ttest command line tool (for esock server and client). OTP-15822
2019-05-29[esock|ttest] Updated the ttest command line toolMicael Karlberg
Updated the ttest command line tool to the new API. OTP-15822