diff options
| author | Erlang/OTP <otp@erlang.org> | 2021-04-07 14:48:42 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2021-04-07 14:48:42 +0200 |
| commit | e9abe9f3d17c14ef0c7013da5003d4dcb5e2850e (patch) | |
| tree | b268996836ece278b7b33153676213e9611989da | |
| parent | 3ddc052d0826fddff46f7fa552998efa3c53b8dd (diff) | |
| download | erlang-e9abe9f3d17c14ef0c7013da5003d4dcb5e2850e.tar.gz | |
Prepare release
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index e647bd1d94..b6e9bbade9 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,22 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 10.2.4.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix handling of emulated socket options, the previous + patch was incomplete,</p> + <p> + Own Id: OTP-17305</p> + </item> + </list> + </section> + +</section> + <section><title>SSL 10.2.4.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 8784c37881..00918c03b3 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 10.2.4.1 +SSL_VSN = 10.2.4.2 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 9dc3c0a550..f35352f46c 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1 +1 @@ -OTP-17289 +OTP-17305 |