From 99e6510d22accbcc7ce4e7c198bd6940422eda3f Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 17 Nov 2017 14:19:24 +0100
Subject: Prepare release

---
 lib/ssh/doc/src/notes.xml | 26 ++++++++++++++++++++++++++
 lib/ssh/vsn.mk            |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index ef3e94a1e1..216f7b1bff 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,32 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.6.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trailing white space was removed at end of the
+	    hello-string. This caused interoperability problems with
+	    some other ssh-implementations (e.g OpenSSH 7.3p1 on
+	    Solaris 11)</p>
+          <p>
+	    Own Id: OTP-14763 Aux Id: ERIERL-74 </p>
+        </item>
+        <item>
+          <p>
+	    Fixes that tcp connections that was immediately closed
+	    (SYN, SYNACK, ACK, RST) by a client could be left in a
+	    zombie state.</p>
+          <p>
+	    Own Id: OTP-14778 Aux Id: ERIERL-104 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 5154658e8a..59775d2d7f 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.6.1
+SSH_VSN = 4.6.2
 
 APP_VSN    = "ssh-$(SSH_VSN)"
-- 
cgit v1.2.3