From 914ef8c467927caf7c18511ae17eec541f687edb Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Wed, 26 May 2010 14:38:02 +0000
Subject: Preparing for new version.

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

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 67a226f726..7c8735cf56 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -37,6 +37,18 @@
           <p>The function ssh:connect/4 was not exported.</p>
           <p>Own Id: OTP-8550 Aux Id:</p>
         </item>
+        <item>
+          <p>Aligned error message with used version (SSH_FX_FAILURE vs
+             SSH_FX_NOT_A_DIRECTORY, the latter introduced in version 6).</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>Own Id: OTP-8644 Aux Id: seq11574</p>
+        </item>
+        <item>
+          <p>Resolved race condition when another connection is started
+             before a channel is opened in the first connection.</p>
+          <p>Own Id: OTP-8645 Aux Id: seq11577</p>
+        </item>
       </list>
     </section>
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 38a82ff32d..ccdbfe4f9a 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -7,7 +7,9 @@ TICKETS = OTP-8524 \
 	OTP-8534 \
 	OTP-8535 \
 	OTP-8550 \
-	OTP-8596
+	OTP-8596 \
+	OTP-8644 \
+	OTP-8645
 
 TICKETS_1.1.8 = OTP-8356 \
 	OTP-8401
-- 
cgit v1.2.3