aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-11-14 10:03:46 +0100
committerErlang/OTP <[email protected]>2018-11-14 10:03:46 +0100
commitc4f2388993020243ca390b259f97f5a85fb785b1 (patch)
treeba328089a67a36bed24ad5ef9d421d2a306f4239
parent23ea9ba0451753b317117bd3f3148b1dbfbbdcb6 (diff)
downloadotp-c4f2388993020243ca390b259f97f5a85fb785b1.tar.gz
otp-c4f2388993020243ca390b259f97f5a85fb785b1.tar.bz2
otp-c4f2388993020243ca390b259f97f5a85fb785b1.zip
Prepare release
-rw-r--r--lib/ssh/doc/src/notes.xml16
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--make/otp_version_tickets2
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 12470df7b9..1f01ce5e6c 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,22 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.6.9.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Incompatibility with newer OpenSSH fixed. Previously
+ versions 7.8 and later could cause Erlang SSH to exit.</p>
+ <p>
+ Own Id: OTP-15413</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.6.9.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 5787238669..9644330eff 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.6.9.1
+SSH_VSN = 4.6.9.2
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 2cba13f734..8877567027 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1 +1 @@
-OTP-15420
+OTP-15413