aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-09 12:04:49 +0200
committerHans Nilsson <[email protected]>2017-10-09 12:04:49 +0200
commitd68b3def1b2d448d1585182a0b987e79333b33b4 (patch)
treeee03096415bb249e5cf52dc5ada7b5f8f0f1dd77 /lib/ssh/doc/src
parentd52b0496f9f6ef15a98a77749c11dd662a1a951f (diff)
parent3f4aac5b00959d3f0ddfaf54a3163cd75053dd24 (diff)
downloadotp-d68b3def1b2d448d1585182a0b987e79333b33b4.tar.gz
otp-d68b3def1b2d448d1585182a0b987e79333b33b4.tar.bz2
otp-d68b3def1b2d448d1585182a0b987e79333b33b4.zip
Merge branch 'maint' into hans/ssh/ssh_dbg_hostkey/OTP-14658
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/notes.xml28
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 4ba75b761f..ef3e94a1e1 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,34 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.6.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed broken printout</p>
+ <p>
+ Own Id: OTP-14645</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Disable aes_gcm ciphers if peer is OpenSSH 6.2 which is
+ known to have trouble with them in some cases.</p>
+ <p>
+ Own Id: OTP-14638</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.6</title>
<section><title>Fixed Bugs and Malfunctions</title>