aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-02-05 13:56:31 +0100
committerErlang/OTP <[email protected]>2014-02-05 13:56:31 +0100
commit5a137003f1eb045a39c18438ecc1b22081747487 (patch)
tree52687a113fca91dcb3cf16ef41fd8ee618b477cc
parent5f30912275c02e06de2a03e5b03c64b919c5a048 (diff)
downloadotp-5a137003f1eb045a39c18438ecc1b22081747487.tar.gz
otp-5a137003f1eb045a39c18438ecc1b22081747487.tar.bz2
otp-5a137003f1eb045a39c18438ecc1b22081747487.zip
Prepare release
-rw-r--r--lib/inets/doc/src/notes.xml18
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index f99bb14c5d..cff2ca427d 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,23 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 5.9.2.2</title>
+ <section><title>Inets 5.9.8</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Mend max_clients check that was broken and avoid too
+ extensive logging that could cause memory problems.</p>
+ <p>
+ Own Id: OTP-11557 Aux Id: seq12478 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 5.9.2.2</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 7b9b6d03bc..f7abd84345 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.1.2.2
+SSL_VSN = 5.2.1.2