diff options
author | Raimo Niskanen <[email protected]> | 2019-02-18 13:40:17 +0100 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2019-02-18 13:40:17 +0100 |
commit | 95b694697291d67c3369f79aa8c73809be183019 (patch) | |
tree | 05b41e5f56baf47e121c8aa96981686475040edd /erts | |
parent | 1c5c381fda617c6299ebc8200ea28f95954f53bd (diff) | |
parent | 7a8ee449b79da291ea702c69a7ed4ed6cdae286c (diff) | |
download | otp-95b694697291d67c3369f79aa8c73809be183019.tar.gz otp-95b694697291d67c3369f79aa8c73809be183019.tar.bz2 otp-95b694697291d67c3369f79aa8c73809be183019.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Diffstat (limited to 'erts')
-rw-r--r-- | erts/doc/src/notes.xml | 18 | ||||
-rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 44d072df23..3473a12526 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,24 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 10.2.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + When using the <c>{linger,{true,T}}</c> option; + <c>gen_tcp:listen/2</c> used the full linger time before + returning for example <c>eaddrinuse</c>. This bug has now + been corrected.</p> + <p> + Own Id: OTP-14728 Aux Id: ERIERL-303 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.2.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 9c912a422b..e4bdb1a8eb 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.2.3 +VSN = 10.2.4 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |