diff options
author | Hans Nilsson <[email protected]> | 2018-03-02 12:15:42 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-03-02 12:15:42 +0100 |
commit | 61a04adfed7e6f0b5b9490d3af056b4b0f9340cd (patch) | |
tree | 81f636c7f58db0438d4164f659ac23a5a65fdb1b /lib | |
parent | 80744b8b217019556e3516fb4058d4df4323e539 (diff) | |
parent | 81b7a88884fd4ec36fd08680d04bff01d45e5548 (diff) | |
download | otp-61a04adfed7e6f0b5b9490d3af056b4b0f9340cd.tar.gz otp-61a04adfed7e6f0b5b9490d3af056b4b0f9340cd.tar.bz2 otp-61a04adfed7e6f0b5b9490d3af056b4b0f9340cd.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssl: Prepare for release
ssl: Backport PR-1709
ssh: Fix cli
ssh: Test for disabled shell
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ssh/doc/src/notes.xml | 17 | ||||
-rw-r--r-- | lib/ssl/doc/src/notes.xml | 15 |
2 files changed, 31 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index c559da911b..df2e04c92a 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -49,7 +49,6 @@ </list> </section> - <section><title>Improvements and New Features</title> <list> <item> @@ -406,6 +405,22 @@ </section> + +<section><title>Ssh 4.4.2.2</title> + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Default exec is disabled when a user-defined shell is + enabled.</p> + <p> + Own Id: OTP-14881</p> + </item> + </list> + </section> +</section> + + <section><title>Ssh 4.4.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 79176f5edf..bdf8711b2f 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -307,6 +307,21 @@ </section> </section> +<section><title>SSL 8.1.3.1.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix alert handling so that unexpected messages are logged + and alerted correctly</p> + <p> + Own Id: OTP-14929</p> + </item> + </list> + </section> +</section> + <section><title>SSL 8.1.3.1</title> <section><title>Fixed Bugs and Malfunctions</title> <list> |