aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-03-10 13:10:51 +0100
committerErlang/OTP <[email protected]>2016-03-10 13:10:51 +0100
commit3a8f2995caffacddabb3363453c6a7dbc33d6329 (patch)
tree1661cf01d8b035770b158827e1a511562c435f04 /lib/ssl
parentb612d83194ec1b88772f0d6c69600da2e4b918cf (diff)
downloadotp-3a8f2995caffacddabb3363453c6a7dbc33d6329.tar.gz
otp-3a8f2995caffacddabb3363453c6a7dbc33d6329.tar.bz2
otp-3a8f2995caffacddabb3363453c6a7dbc33d6329.zip
Prepare release
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/notes.xml18
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 14df10b571..759a3b3fce 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -25,7 +25,23 @@
<file>notes.xml</file>
</header>
<p>This document describes the changes made to the SSL application.</p>
- <section><title>SSL 6.0.1.1</title>
+ <section><title>SSL 6.0.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Hibernation with small or a zero timeout will now work as
+ expected</p>
+ <p>
+ Own Id: OTP-13189</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SSL 6.0.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index eedf8cf705..29f51032e1 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 6.0.1.1
+SSL_VSN = 6.0.1.2