diff options
| author | Erlang/OTP <[email protected]> | 2015-12-03 11:11:17 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-12-03 11:11:17 +0100 |
| commit | ad50eefb67a69d755d46126bf5e436bf85644c8b (patch) | |
| tree | 6b9f195109802957546759567436b2853981ec36 | |
| parent | 64fd2820d57282ab782fb5f7edec643fdd08f117 (diff) | |
| download | otp-ad50eefb67a69d755d46126bf5e436bf85644c8b.tar.gz otp-ad50eefb67a69d755d46126bf5e436bf85644c8b.tar.bz2 otp-ad50eefb67a69d755d46126bf5e436bf85644c8b.zip | |
Prepare release
| -rw-r--r-- | erts/doc/src/notes.xml | 19 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/notes.xml | 19 | ||||
| -rw-r--r-- | lib/kernel/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 17 |
5 files changed, 56 insertions, 3 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 diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 6f7f18a8e7..6cc41403c8 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -30,6 +30,25 @@ </header> <p>This document describes the changes made to the Kernel application.</p> +<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> diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index e1d447a465..2ea32065b9 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 3.2 +KERNEL_VSN = 3.2.0.1 diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index fe0606b1a3..14df10b571 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -25,7 +25,22 @@ <file>notes.xml</file> </header> <p>This document describes the changes made to the SSL application.</p> - <section><title>SSL 6.0.1</title> + <section><title>SSL 6.0.1.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Gracefully ignore proprietary hash_sign algorithms</p> + <p> + Own Id: OTP-13151</p> + </item> + </list> + </section> + +</section> + +<section><title>SSL 6.0.1</title> <section><title>Fixed Bugs and Malfunctions</title> <list> |