aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-12-03 11:11:17 +0100
committerErlang/OTP <[email protected]>2015-12-03 11:11:17 +0100
commitad50eefb67a69d755d46126bf5e436bf85644c8b (patch)
tree6b9f195109802957546759567436b2853981ec36 /erts
parent64fd2820d57282ab782fb5f7edec643fdd08f117 (diff)
downloadotp-ad50eefb67a69d755d46126bf5e436bf85644c8b.tar.gz
otp-ad50eefb67a69d755d46126bf5e436bf85644c8b.tar.bz2
otp-ad50eefb67a69d755d46126bf5e436bf85644c8b.zip
Prepare release
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml19
-rw-r--r--erts/vsn.mk2
2 files changed, 20 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index cc224bee49..a64d699cec 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,25 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 6.4.1.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The 'raw' socket option could not be used multiple times
+ in one call to any e.g gen_tcp function because only one
+ of the occurrences were used. This bug has been fixed,
+ and also a small bug concerning propagating error codes
+ from within inet:setopts/2.</p>
+ <p>
+ Own Id: OTP-11482 Aux Id: seq12872 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 6.4.1.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index b8f4cf6946..4f5002d401 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
# %CopyrightEnd%
#
-VSN = 6.4.1.3
+VSN = 6.4.1.4
# Port number 4365 in 4.2
# Port number 4366 in 4.3