aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-05-26 14:38:02 +0000
committerErlang/OTP <[email protected]>2010-05-26 14:38:02 +0000
commit914ef8c467927caf7c18511ae17eec541f687edb (patch)
tree716123de01867c0b974b164dd3cb11e0c594145b /lib
parent4aa5dadc3b966cffc2ffcaadf1b132f276afe75a (diff)
downloadotp-914ef8c467927caf7c18511ae17eec541f687edb.tar.gz
otp-914ef8c467927caf7c18511ae17eec541f687edb.tar.bz2
otp-914ef8c467927caf7c18511ae17eec541f687edb.zip
Preparing for new version.
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/doc/src/notes.xml12
-rw-r--r--lib/ssh/vsn.mk4
2 files changed, 15 insertions, 1 deletions
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