aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-24 12:49:05 +0200
committerHans Nilsson <[email protected]>2018-04-24 12:49:05 +0200
commit0de7634ca20ff7d8dec143b92130cd04025557fc (patch)
tree65ee857a9d348427f74c784db49215e8ff51bfb6 /lib/ssh
parent0343b68b053ee97b2ef70ea07b9aa87e8842c591 (diff)
parent60abdddf4bc5a25ca31af151642ca59c7dd07e92 (diff)
downloadotp-0de7634ca20ff7d8dec143b92130cd04025557fc.tar.gz
otp-0de7634ca20ff7d8dec143b92130cd04025557fc.tar.bz2
otp-0de7634ca20ff7d8dec143b92130cd04025557fc.zip
Merge branch 'maint-18' into maint
* maint-18: Updated OTP version Prepare release ssh: Fix server crashes for exit-normal signals Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk otp_versions.table
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/notes.xml18
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 1453141811..d78309167a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -31,7 +31,6 @@
</header>
<section><title>Ssh 4.6.8</title>
-
<section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>
@@ -82,8 +81,6 @@
</item>
</list>
</section>
-
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -908,6 +905,21 @@
</section>
+<section><title>Ssh 4.2.2.6</title>
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix rare spurios shutdowns of ssh servers when receiveing
+ <c>{'EXIT',_,normal}</c> messages.</p>
+ <p>
+ Own Id: OTP-15018</p>
+ </item>
+ </list>
+ </section>
+</section>
+
+
<section><title>Ssh 4.2.2.5</title>
<section><title>Improvements and New Features</title>
<list>