aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-04-06Merge branch 'maint-19' into maintHans Nilsson
* maint-19: Updated OTP version Prepare release ssh: Fix ssh_sftpd:handle_op not returning State Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/vsn.mk otp_versions.table
2018-04-05Updated OTP versionOTP-19.3.6.8Erlang/OTP
2018-04-05Prepare releaseErlang/OTP
2018-04-05Merge branch 'hans/ssh/sftpd_rm_dir_err_19/OTP-15004' into maint-19Erlang/OTP
* hans/ssh/sftpd_rm_dir_err_19/OTP-15004: ssh: Fix ssh_sftpd:handle_op not returning State
2018-04-05ssh: Fix ssh_sftpd:handle_op not returning StateHans Nilsson
2018-03-22Merge branch 'maint-19' into maintSverker Eriksson
Dummy merge (almost). os:cmd/2 already in OTP-20.
2018-03-21Updated OTP versionOTP-20.3.2Erlang/OTP
2018-03-21Update release notesErlang/OTP
2018-03-21Update version numbersErlang/OTP
2018-03-21Merge branch 'hans/ssh/spec_double_algs/OTP-14990' into maint-20Erlang/OTP
* hans/ssh/spec_double_algs/OTP-14990: ssh: Fix bad spec for double_algs() in ssh.hrl
2018-03-21Merge branch 'raimo/stdlib/fix-gen_statem-init-actions-check/OTP-13995' into ↵Erlang/OTP
maint-20 * raimo/stdlib/fix-gen_statem-init-actions-check/OTP-13995: Test event insert from init Fix init to allow all actions
2018-03-21Updated OTP versionOTP-19.3.6.7Erlang/OTP
2018-03-21Prepare releaseErlang/OTP
2018-03-21Merge branch 'sverker/maint-19/os-cmd-2/OTP-14823' into maint-19Erlang/OTP
* sverker/maint-19/os-cmd-2/OTP-14823: kernel: Fix os_SUITE:max_size_command for OTP-19 kernel: Fix handling of os:cmd option max_size in win kernel: Add os:cmd/2 with max_size option
2018-03-21kernel: Fix os_SUITE:max_size_command for OTP-19Sverker Eriksson
where string:trim does not exist.
2018-03-21kernel: Fix handling of os:cmd option max_size in winLukas Larsson
git cherry-pick 75b0f73f72e1783d4ace976cdd2b5f23bdc3ebae
2018-03-21kernel: Add os:cmd/2 with max_size optionLukas Larsson
git cherry-pick 55e929c4ed5cd854038c18697123ea94948ebf35
2018-03-20ssh: Fix bad spec for double_algs() in ssh.hrlHans Nilsson
2018-03-17Test event insert from initRaimo Niskanen
2018-03-15Fix init to allow all actionsRaimo Niskanen
2018-03-15Updated OTP versionOTP-20.3.1Erlang/OTP
2018-03-15Update release notesErlang/OTP
2018-03-15Merge branch 'ingela/ssl/filter-bug/OTP-14981' into maint-20Erlang/OTP
* ingela/ssl/filter-bug/OTP-14981: ssl: Prepare for release ssl: Remove duplicate release note ssl: Fix filter function to not discard AEAD cipher suites
2018-03-15ssl: Prepare for releaseIngela Anderton Andin
2018-03-15ssl: Remove duplicate release noteIngela Anderton Andin
2018-03-15ssl: Fix filter function to not discard AEAD cipher suitesIngela Anderton Andin
2018-03-09Updated OTP versionOTP-20.3Erlang/OTP
2018-03-09Update release notesErlang/OTP
2018-03-09Update version numbersErlang/OTP
2018-03-09Update preloaded modulesHenrik
2018-03-09Update primary bootstrapHenrik
2018-03-07Merge pull request #1724 from lucafavatella/http_uri-typesPéter Dimitrov
Export types documented for http_uri module
2018-03-06Merge branch ↵Ingela Anderton Andin
'ingela/maint/voltone/ssl_anonymous_with_openssl/PR-1729/OTP-14952' into maint * ingela/maint/voltone/ssl_anonymous_with_openssl/PR-1729/OTP-14952: ssl: Fix anonymous suites regression and protocol error
2018-03-06Merge branch 'hans/ssh/cuddle_README' into maintHans Nilsson
* hans/ssh/cuddle_README: ssh: README updated with missing 4-number's versions
2018-03-06ssl: Fix anonymous suites regression and protocol errorBram Verburg
Anonymous cipher suites were broken altogether, and there was an earlier issue where the server would send a signature in the server key exchange if a certificate was configured, even if an anonymous suite was actually negotiated. Backport of PR-1729
2018-03-06Merge branch 'peterdmv/inets/unix_domain_socket/OTP-14854' into maintPéter Dimitrov
* peterdmv/inets/unix_domain_socket/OTP-14854: inets: Prepare for release inets: Skip http_unix_socket test group on Windows inets: Add unix domain socket support to httpc Change-Id: I680e41463849a9d79add1385ec2703267be8754c
2018-03-06inets: work around http_uri:parse Dialyzer warning in uri_SUITE.erl:274Luca Favatella
Addresses https://github.com/erlang/otp/pull/1724#discussion_r172442753 Current `http_uri:parse/2` implementation intends that ["non-fun scheme_validation_fun works as no option passed"](https://github.com/erlang/otp/blob/OTP-20.2.4/lib/inets/test/uri_SUITE.erl#L271-L274).
2018-03-06inets: Prepare for releasePéter Dimitrov
Change-Id: I3021abef9530d42fa6eb04fbcbd46ab23392cd0d
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-05ssh: README updated with missing 4-number's versionsHans Nilsson
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-05inets: refine types and doc of http_uri:parse optionsLuca Favatella
2018-03-05[crypto] Fix hanging test case on outdated lab machineLars Thorsen
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-05inets: export types documented for http_uri moduleLuca Favatella
Also: * Reuse type `inet:port_number()` in `http_uri` code and doc; * Do not imply that http_uri module can properly handle UTF-8 encoded binaries, while it can't. * Enrich function specifications in http_uri module; * Fix http_uri doc re missing type definition for `Scheme`.
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 'anders/diameter/terminate/ERIERL-124' into maintAnders Svensson
* anders/diameter/terminate/ERIERL-124: Fix handling of SUSPECT connections at service termination
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 15:11:36 +0000