aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-16 09:33:48 +0200
committerHenrik Nord <[email protected]>2015-10-16 09:33:48 +0200
commitba49561cf3e2167acd5457de93b05e772f2fb16a (patch)
tree9a9407f5ae2c123d7ab9f4c1fbc2f81e7e8dcd35 /lib/ssh/doc/src
parent2a3781b127ccd4b2065eed77de03a8a9a418f1f7 (diff)
parentfe1df7fc6bf050cb6c9bbd99eb9393c426b62f67 (diff)
downloadotp-ba49561cf3e2167acd5457de93b05e772f2fb16a.tar.gz
otp-ba49561cf3e2167acd5457de93b05e772f2fb16a.tar.bz2
otp-ba49561cf3e2167acd5457de93b05e772f2fb16a.zip
Merge branch 'maint-18' into maint
Conflicts: lib/ssh/vsn.mk
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/notes.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 0c0c947f65..bb111c8e0e 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,21 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Add a 1024 group to the list of key group-exchange groups</p>
+ <p>
+ Own Id: OTP-13046</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.1.1</title>
<section><title>Improvements and New Features</title>