summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2020-12-04 17:37:10 +0100
committerErlang/OTP <otp@erlang.org>2020-12-04 17:37:10 +0100
commit3e1b2c38daa38851255ca8ad9f60a0259bb21a3f (patch)
tree45a13348383ba9441f4cab451c0bb8e242fa6be9
parent46488eeb44c99edb8716c104caec1cb57c71d936 (diff)
downloaderlang-3e1b2c38daa38851255ca8ad9f60a0259bb21a3f.tar.gz
Prepare release
-rw-r--r--lib/ssh/doc/src/notes.xml20
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--make/otp_version_tickets2
3 files changed, 22 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 8ae11ca5dd..9d07f88a44 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,26 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.10.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ An ssh-client can take an accepted socket from a
+ listening socket and do an ssh:connect/2 on it.</p>
+ <p>
+ Multiple clients on sockets accepted from the same
+ listening socket had stopped working. This is corrected
+ now.</p>
+ <p>
+ Own Id: OTP-17021 Aux Id: ERIERL-567 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.10.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 76c42993a9..a766d27020 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.10.4
+SSH_VSN = 4.10.5
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 3e7bbe936e..63038d6310 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,2 +1,2 @@
OTP-16607
-OTP-17016
+OTP-17021