diff options
| author | Henrik Nord <[email protected]> | 2015-12-04 14:44:45 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-12-04 15:09:28 +0100 |
| commit | 4b5cc477a78247dd68f142d5cb044ff0c34a576b (patch) | |
| tree | 8a9c1d261f7370eae541e5e5d6b2ea41c95e5626 /lib/ssl | |
| parent | f86828fead59ba0a28658d3f5e7d8dc80f1c73fb (diff) | |
| parent | 4481c1b152a4442f2e0a648ab2877313dcc97c50 (diff) | |
| download | otp-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/ssl')
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 6faa3d5f9a..4d4a219b4f 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -26,8 +26,9 @@ <file>notes.xml</file> </header> <p>This document describes the changes made to the SSL application.</p> - <section><title>SSL 7.1</title> + +<section><title>SSL 7.1</title> <section><title>Fixed Bugs and Malfunctions</title> <list> <item> @@ -107,12 +108,6 @@ <p> Own Id: OTP-12815</p> </item> - <item> - <p> - Gracefully ignore proprietary hash_sign algorithms</p> - <p> - Own Id: OTP-12829</p> - </item> </list> </section> @@ -163,6 +158,20 @@ </section> +<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-12829</p> + </item> + </list> + </section> +</section> + + <section><title>SSL 6.0.1</title> <section><title>Fixed Bugs and Malfunctions</title> |