aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-04-12 14:48:21 +0200
committerHans Nilsson <[email protected]>2019-04-12 14:48:21 +0200
commitbe1c449af5afb7b6494b7e2629977fbc024de087 (patch)
tree42e6dee96da46b551ea67494905ed836f67316e0 /erts
parentc24ea58313c7a2b837831c9c8f9439d0ababe5df (diff)
parent7ad05d6dd4230061e8120ae8c0dec2535f47e294 (diff)
downloadotp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.gz
otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.bz2
otp-be1c449af5afb7b6494b7e2629977fbc024de087.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
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 4c70101358..d77235782b 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.3.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix <c>erlang:open_port/2</c> with the <c>fd</c> option
+ to correctly cleanup the pollset when the port is closed.
+ Before this fix there would be error printouts sent to
+ logger when the same fd was reused in a new port.</p>
+ <p>
+ Own Id: OTP-15753 Aux Id: ERL-900 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 10.3.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index bce5ce4167..785c7626e7 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.3.2
+VSN = 10.3.3
# Port number 4365 in 4.2
# Port number 4366 in 4.3