aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-12-04 15:09:47 +0100
committerHenrik Nord <[email protected]>2015-12-04 15:09:47 +0100
commit4dd436b2d887517d50386372946a495aed698663 (patch)
treec36c81d378e88d44f61e02b1325440bc0e3019ed /erts/doc
parentc5e3f065998057c2bb304d75f9ec00228bacfc36 (diff)
parent4b5cc477a78247dd68f142d5cb044ff0c34a576b (diff)
downloadotp-4dd436b2d887517d50386372946a495aed698663.tar.gz
otp-4dd436b2d887517d50386372946a495aed698663.tar.bz2
otp-4dd436b2d887517d50386372946a495aed698663.zip
Merge branch 'maint'
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/notes.xml23
1 files changed, 22 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index f27e73b9d3..b4bdc5735c 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,8 +31,9 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
-<section><title>Erts 7.1</title>
+
+<section><title>Erts 7.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>
@@ -981,6 +982,26 @@
</section>
+<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</title>
<section><title>Fixed Bugs and Malfunctions</title>