summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2021-03-29 15:15:55 +0200
committerErlang/OTP <otp@erlang.org>2021-03-29 15:15:55 +0200
commitfbab4dffca987745e666f2c757c9c99998773af4 (patch)
tree46ee8395e974e617c4b36f706efbf6f41cf3774d
parent5e5d45cec25c451b3ed42013338585048117728a (diff)
downloaderlang-fbab4dffca987745e666f2c757c9c99998773af4.tar.gz
Prepare release
-rw-r--r--lib/ssh/doc/src/notes.xml17
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--make/otp_version_tickets62
3 files changed, 20 insertions, 61 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 4a9fc3b19d..7e7ed4ae37 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,23 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.11.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The idle_time timer was not cancelled when a channel was
+ opened within the timeout time on an empty connection
+ that have had channels previously.</p>
+ <p>
+ Own Id: OTP-17279</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.11</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index dff8da55c7..2a4487a813 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.11
+SSH_VSN = 4.11.1
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index b17befa8a5..c9e062ec5c 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,61 +1,3 @@
-OTP-13641
OTP-16607
-OTP-16876
-OTP-16907
-OTP-16959
-OTP-16978
-OTP-16985
-OTP-17002
-OTP-17032
-OTP-17042
-OTP-17043
-OTP-17064
-OTP-17073
-OTP-17081
-OTP-17086
-OTP-17089
-OTP-17091
-OTP-17096
-OTP-17109
-OTP-17111
-OTP-17113
-OTP-17116
-OTP-17124
-OTP-17126
-OTP-17127
-OTP-17138
-OTP-17145
-OTP-17162
-OTP-17163
-OTP-17164
-OTP-17166
-OTP-17167
-OTP-17178
-OTP-17182
-OTP-17187
-OTP-17188
-OTP-17194
-OTP-17195
-OTP-17197
-OTP-17200
-OTP-17202
-OTP-17208
-OTP-17209
-OTP-17212
-OTP-17223
-OTP-17225
-OTP-17229
-OTP-17242
-OTP-17244
-OTP-17249
-OTP-17252
-OTP-17253
-OTP-17256
-OTP-17261
-OTP-17265
-OTP-17271
-OTP-17273
-OTP-17274
-OTP-17281
-OTP-17282
-OTP-17283
+OTP-17227
+OTP-17279