aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-02-18 13:38:41 +0100
committerRaimo Niskanen <[email protected]>2019-02-18 13:38:41 +0100
commit7a8ee449b79da291ea702c69a7ed4ed6cdae286c (patch)
tree0764a96b9501552d255a850aadb3025ed051ecc5 /erts
parentd04ceae537e037555cb0ae962f3164dc6c499340 (diff)
parentf30b1052c7097a95faaba272feccc6190682a7f8 (diff)
downloadotp-7a8ee449b79da291ea702c69a7ed4ed6cdae286c.tar.gz
otp-7a8ee449b79da291ea702c69a7ed4ed6cdae286c.tar.bz2
otp-7a8ee449b79da291ea702c69a7ed4ed6cdae286c.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml18
-rw-r--r--erts/vsn.mk2
2 files changed, 19 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index cecfe2d695..9ea1beb887 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