aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-03-18 14:21:06 +0100
committerAnders Svensson <[email protected]>2013-03-19 13:16:42 +0100
commit77c9f844f137deec2d49bd6c28ec03bce97d34df (patch)
treec45df43674f7353ace1952d52fc916c5582d1d02 /lib/ssh
parent37dcd98df7ee567eef6d89b4e77d10628f609029 (diff)
downloadotp-77c9f844f137deec2d49bd6c28ec03bce97d34df.tar.gz
otp-77c9f844f137deec2d49bd6c28ec03bce97d34df.tar.bz2
otp-77c9f844f137deec2d49bd6c28ec03bce97d34df.zip
Prepare release
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/notes.xml15
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index dead764700..f65b66a7c5 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,21 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 2.1.6</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed timing rekeying bug.</p>
+ <p>
+ Own Id: OTP-10940</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 2.1.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 8f6aac1f5d..d5ca1cb3fe 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 2.1.5
+SSH_VSN = 2.1.6
APP_VSN = "ssh-$(SSH_VSN)"