diff options
author | Erlang/OTP <[email protected]> | 2019-05-14 15:27:45 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2019-05-14 15:27:45 +0200 |
commit | ac83ac8a030c8a81722dd18c2a417e2af8b2029f (patch) | |
tree | b1116976df6c13d6f381ba6eef0b5434c3f1f9c9 | |
parent | cef9d9914da3c466da986e98e03b6dcd96715cbe (diff) | |
download | otp-ac83ac8a030c8a81722dd18c2a417e2af8b2029f.tar.gz otp-ac83ac8a030c8a81722dd18c2a417e2af8b2029f.tar.bz2 otp-ac83ac8a030c8a81722dd18c2a417e2af8b2029f.zip |
Prepare release
-rw-r--r-- | erts/doc/src/notes.xml | 17 | ||||
-rw-r--r-- | erts/vsn.mk | 2 | ||||
-rw-r--r-- | lib/ssl/doc/src/notes.xml | 17 | ||||
-rw-r--r-- | lib/ssl/vsn.mk | 2 | ||||
-rw-r--r-- | lib/tools/doc/src/notes.xml | 15 | ||||
-rw-r--r-- | lib/tools/vsn.mk | 2 | ||||
-rw-r--r-- | make/otp_version_tickets | 11 |
7 files changed, 55 insertions, 11 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index e8a7d88f9e..7afff4aa77 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,23 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 10.3.5.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fixed a buffer overflow when + <c>binary_to_existing_atom/2</c> and + <c>list_to_existing_atom/2</c> was used with the + <c>latin1</c> encoding.</p> + <p> + Own Id: OTP-15819 Aux Id: ERL-944 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.3.5</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index c57f8746f6..a97fe7d9f8 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.3.5 +VSN = 10.3.5.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 01323aaa1d..d46b4abf5c 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,23 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 9.2.3.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Correct solution for retaining tcp flow control OTP-15802 + (ERL-934) as to not break ssl:recv as reported in + (ERL-938)</p> + <p> + Own Id: OTP-15823 Aux Id: ERL-934, ERL-938 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 9.2.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index b5545b71f7..e9aff31b38 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 9.2.3 +SSL_VSN = 9.2.3.1 diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml index 28f8346a19..faae48f72d 100644 --- a/lib/tools/doc/src/notes.xml +++ b/lib/tools/doc/src/notes.xml @@ -31,6 +31,21 @@ </header> <p>This document describes the changes made to the Tools application.</p> +<section><title>Tools 3.1.0.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p><c>cover</c> would fail to start if two processes + tried to start it at the exact same time.</p> + <p> + Own Id: OTP-15813 Aux Id: ERL-943 </p> + </item> + </list> + </section> + +</section> + <section><title>Tools 3.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk index 5700885549..77e2b8e00f 100644 --- a/lib/tools/vsn.mk +++ b/lib/tools/vsn.mk @@ -1 +1 @@ -TOOLS_VSN = 3.1 +TOOLS_VSN = 3.1.0.1 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index bf32816fb2..8fa2b7da18 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,8 +1,3 @@ -OTP-14746 -OTP-15295 -OTP-15717 -OTP-15758 -OTP-15781 -OTP-15785 -OTP-15793 -OTP-15802 +OTP-15813 +OTP-15819 +OTP-15823 |