aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-02-28 12:13:56 +0100
committerErlang/OTP <[email protected]>2018-02-28 12:13:56 +0100
commitd3aae0f9f4835f17c9d02ba5ef906aabab3c55cf (patch)
tree1deff6e7cc8f5e972004b4ee6944dee95411c1b0
parentab3c8919df9cbcf58b7e285d04ff0fb19a25891a (diff)
downloadotp-d3aae0f9f4835f17c9d02ba5ef906aabab3c55cf.tar.gz
otp-d3aae0f9f4835f17c9d02ba5ef906aabab3c55cf.tar.bz2
otp-d3aae0f9f4835f17c9d02ba5ef906aabab3c55cf.zip
Prepare release
-rw-r--r--lib/ssh/doc/src/notes.xml16
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/ssl/doc/src/notes.xml16
3 files changed, 33 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index becceb0603..b62731d496 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,22 @@
<file>notes.xml</file>
</header>
+<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.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index a3cb2c5fe7..8249bf4837 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.4.2.1
+SSH_VSN = 4.4.2.2
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index d37a180f54..a8b284304e 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -28,6 +28,22 @@
<p>This document describes the changes made to the SSL application.</p>
+<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>