aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-03-06Merge remote-tracking branch 'origin/hasse/kernel/rpc_doc_fix/OTP-10551'Hans Bolinder
* origin/hasse/kernel/rpc_doc_fix/OTP-10551: kernel: Improve docs of rpc:multicall/5
2018-03-06Merge branch 'maint'Anders Svensson
2018-03-06Merge branch 'anders/diameter/20.3/OTP-14946' into maintAnders Svensson
* anders/diameter/20.3/OTP-14946: vsn -> 2.1.4 Update appup for 20.3 Update service_info examples in doc Fix inaccurate comment
2018-03-05Merge pull request #1560 from tsloughter/no_warn_sysconfigSiri Hansen
Include sys.config.src in release tar file OTP-14950
2018-03-05Merge branch 'maint' of github.com:erlang/otp into maintLars Thorsen
2018-03-05Merge branch 'lars/ssl/test-config-changes/OTP-14949' into maintLars Thorsen
* lars/ssl/test-config-changes/OTP-14949: [ssl] Fix hanging test case on outdated lab machine
2018-03-05[ssl] Fix hanging test case on outdated lab machineLars Thorsen
2018-03-05Merge branch 'lars/crypto/test-config-changes/OTP-14949' into maintLars Thorsen
* lars/crypto/test-config-changes/OTP-14949: [crypto] Fix hanging test case on outdated lab machine
2018-03-05[crypto] Fix hanging test case on outdated lab machineLars Thorsen
2018-03-05Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Update release notes Update version numbers ssh: Fix cli ssh: Test for disabled shell
2018-03-05Merge branch 'maint-18' into maintHans Nilsson
* maint-18: Updated OTP version Update release notes Update version numbers ssh: Fix cli ssh: Test for disabled shell Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.erl lib/ssh/src/ssh_cli.erl lib/ssh/vsn.mk otp_versions.table
2018-03-05Update primary bootstrapRickard Green
2018-03-05Merge branch 'maint'Hans Nilsson
* maint: ssh: Fix the bug ssh: Extend testcase to check the bug
2018-03-05Merge branch 'hans/ssh/closed_chan_block/OTP-14939' into maintHans Nilsson
* hans/ssh/closed_chan_block/OTP-14939: ssh: Fix the bug ssh: Extend testcase to check the bug
2018-03-05Merge branch 'maint'Anders Svensson
2018-03-05Merge branch 'anders/diameter/terminate/ERIERL-124' into maintAnders Svensson
* anders/diameter/terminate/ERIERL-124: Fix handling of SUSPECT connections at service termination
2018-03-05Merge branch 'anders/diameter/reg/OTP-14839' into maintAnders Svensson
* anders/diameter/reg/OTP-14839: Fix diameter_reg:subscribe/2 remove notification
2018-03-05vsn -> 2.1.4Anders Svensson
2018-03-05Update appup for 20.3Anders Svensson
2018-03-05Update service_info examples in docAnders Svensson
Timestamps have been monotonic time since OTP-17.5. See commit e6d19a18. The examples should really be replaced by more detailed doc of return values.
2018-03-05Fix inaccurate commentAnders Svensson
A peer_fsm process can be started long before a connection is established in the listening case. The time reported in a 'peer' tuple in service_info is of connection establishment.
2018-03-05Merge branch 'john/erts/efile_SUITE-iter-max-files-stability'John Högberg
* john/erts/efile_SUITE-iter-max-files-stability: Make efile_SUITE:iter_max_files more stable
2018-03-05Merge branch 'maint'Raimo Niskanen
2018-03-05Merge branch 'raimo/asn1/dialyzer-dead-code/ERIERL-144/OTP-13882' into maintRaimo Niskanen
* raimo/asn1/dialyzer-dead-code/ERIERL-144/OTP-13882: Dialyzer suppress per_common:to_bitstring/2
2018-03-05Merge branch 'maint'Ingela Anderton Andin
2018-03-05Merge branch 'ingela/ssl/AEAD-handling/ERL-568' into maintIngela Anderton Andin
* ingela/ssl/AEAD-handling/ERL-568: ssl: Correct AEAD handling
2018-03-05ssl: Correct AEAD handlingIngela Anderton Andin
Cipher suite handling improvments missed to make a few changes for AEAD to be handled correctly see ERL-568
2018-03-02Merge branch 'lukas/erts/ecio_arg_fix'Lukas Larsson
* lukas/erts/ecio_arg_fix: erts: Correctly ignore +secio true
2018-03-02erts: Correctly ignore +secio trueLukas Larsson
This is a fix for a bug introduced in 22cde2bda
2018-03-02Merge pull request #1734 from wojtekmach/wm-erl-tar-docs-typoLukas Larsson
Fix typo in erl_tar:format_error/1 docs
2018-03-02Merge branch 'maint'Dan Gudmundsson
* maint: Add updated type-spec to Emacs skeletons of OTP behaviours
2018-03-02Merge branch 'pr/1620' into maintDan Gudmundsson
* pr/1620: Add updated type-spec to Emacs skeletons of OTP behaviours
2018-03-02Merge pull request #1731 from bjorng/bjorn/compiler/beam_utilsBjörn Gustavsson
Fix beam_utils bugs that could cause problems in the future
2018-03-02Merge branch 'bjorn/compiler/try-catch-nesting'Björn Gustavsson
* bjorn/compiler/try-catch-nesting: Enhance beam_validator to check proper nesting of try/catch and catch
2018-03-02ssh: Fix the bugHans Nilsson
2018-03-02ssh: Extend testcase to check the bugHans Nilsson
2018-03-02Updated OTP versionOTP-18.3.4.8Erlang/OTP
2018-03-02Update release notesErlang/OTP
2018-03-02Update version numbersErlang/OTP
2018-03-02Merge branch 'hans/ssh/execfix18/OTP-14881' into maint-18Erlang/OTP
* hans/ssh/execfix18/OTP-14881: ssh: Fix cli ssh: Test for disabled shell
2018-03-02Add updated type-spec to Emacs skeletons of OTP behavioursHamidreza Soleimani
The changes are based on the latest versions of following modules and are also similar to gen_statem Emacs skeleton. Note that the gen_fsm is not updated because it is deprecated. application: * add/update type-spec for all callbacks * add start_phase/3 callback * add prep_stop/1 callback * add config_change/3 callback supervisor: * add/update type-spec for all callbacks supervisor_bridge: * add/update type-spec for all callbacks gen_server: * add/update type-spec for all callbacks * add format_status/2 callback gen_event: * add/update type-spec for all callbacks * add format_status/2 callback
2018-03-02Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssl: Prepare for release ssl: Backport PR-1709 ssh: Fix cli ssh: Test for disabled shell
2018-03-02Merge branch 'maint-19' into maintHans Nilsson
* maint-19: Updated OTP version Prepare release ssl: Prepare for release ssl: Backport PR-1709 ssh: Fix cli ssh: Test for disabled shell Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.erl lib/ssh/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/vsn.mk otp_versions.table
2018-03-02Dialyzer suppress per_common:to_bitstring/2Raimo Niskanen
2018-03-02Merge branch 'maint'Hans Nilsson
* maint: ssh: Extend ssh_basic_SUITE:packet_size_zero to ...:packet_size Also got rid of some EXIT messages due to ssh_connection:shell/2 being async and ssh:close came too soon
2018-03-02Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Extend ssh_basic_SUITE:packet_size_zero to ...:packet_size Also got rid of some EXIT messages due to ssh_connection:shell/2 being async and ssh:close came too soon
2018-03-02Merge branch 'maint'Hans Nilsson
* maint: ssh: Disable exec for non-default shell ssh: Test for disabled shell
2018-03-02Merge branch 'hans/ssh/execfix20/OTP-14881' into maintHans Nilsson
* hans/ssh/execfix20/OTP-14881: ssh: Disable exec for non-default shell ssh: Test for disabled shell
2018-03-02Merge branch 'maint'Lukas Larsson
2018-03-02Merge branch 'lukas/kernel/fix_os_cmd_max_size_win32/OTP-14940' into maintLukas Larsson
* lukas/kernel/fix_os_cmd_max_size_win32/OTP-14940: stdlib: Fix doc link in timer kernel: Fix handling of os:cmd option max_size in win