aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-12-04 14:44:45 +0100
committerHenrik Nord <[email protected]>2015-12-04 15:09:28 +0100
commit4b5cc477a78247dd68f142d5cb044ff0c34a576b (patch)
tree8a9c1d261f7370eae541e5e5d6b2ea41c95e5626 /lib/kernel/doc/src
parentf86828fead59ba0a28658d3f5e7d8dc80f1c73fb (diff)
parent4481c1b152a4442f2e0a648ab2877313dcc97c50 (diff)
downloadotp-4b5cc477a78247dd68f142d5cb044ff0c34a576b.tar.gz
otp-4b5cc477a78247dd68f142d5cb044ff0c34a576b.tar.bz2
otp-4b5cc477a78247dd68f142d5cb044ff0c34a576b.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/kernel/doc/src/notes.xml lib/kernel/src/kernel.appup.src lib/kernel/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl_cipher.erl lib/ssl/vsn.mk otp_versions.table
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/notes.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 268a8404f1..d02c3e8ad2 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -185,6 +185,22 @@
</section>
+<section><title>Kernel 3.2.0.1</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>Kernel 3.2</title>
<section><title>Fixed Bugs and Malfunctions</title>