diff options
| author | Erlang/OTP <otp@erlang.org> | 2021-03-29 15:12:53 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2021-03-29 15:12:53 +0200 |
| commit | 76b943aa63f142f18d4f1d8dbc219e924bcb43a7 (patch) | |
| tree | 98e71c173270478b96f672e4dad26126a6ee3fcc | |
| parent | 16878bbf487674f95796adaffa70b7dc9488cdd2 (diff) | |
| download | erlang-76b943aa63f142f18d4f1d8dbc219e924bcb43a7.tar.gz | |
Prepare release
| -rw-r--r-- | erts/doc/src/notes.xml | 36 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 5 |
5 files changed, 58 insertions, 4 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 10a14833e3..507a2aacf0 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,42 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 10.3.5.17</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fixed a bug in the timer implementation which could cause + timers that were set to more than 37.25 hours in the + future to be delayed. This could occur if there were + multiple timers scheduled to be triggered very close in + time, but still at different times, and the scheduler + thread handling the timers was not able to handle them + quickly enough. Delayed timers were in this case + triggered when another unrelated timer was triggered.</p> + <p> + Own Id: OTP-17253</p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Fix a file descriptor leak when using sendfile and the + remote side closes the connection. This bug has been + present since OTP-21.0.</p> + <p> + Own Id: OTP-17244</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.3.5.16</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index c8d6e9fce9..e2031d53f6 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.3.5.16 +VSN = 10.3.5.17 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index d61b3898be..723e64c3e8 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.7.6.6</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.7.6.5</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 60f610f3ec..d28ffb8b25 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.7.6.5 +SSH_VSN = 4.7.6.6 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 7f1af54991..f335bf4329 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,3 +1,4 @@ OTP-16607 -OTP-16779 -OTP-17185 +OTP-17244 +OTP-17253 +OTP-17279 |