aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-05-15 09:55:55 +0200
committerIngela Anderton Andin <[email protected]>2019-05-15 09:55:55 +0200
commit1c19c9af6531f600bf3368b8c7baed243cecc2a3 (patch)
treefea029761cbd12f2182c60b9aa06325d857ce762 /lib
parentcd29130a86e77108e75e770afea5952f47167067 (diff)
parent3b2c1dd3fdf1fec362cff3a88e188ef989ee79e5 (diff)
downloadotp-1c19c9af6531f600bf3368b8c7baed243cecc2a3.tar.gz
otp-1c19c9af6531f600bf3368b8c7baed243cecc2a3.tar.bz2
otp-1c19c9af6531f600bf3368b8c7baed243cecc2a3.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/doc/src/notes.xml17
-rw-r--r--lib/tools/doc/src/notes.xml15
2 files changed, 32 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 5fdcf15b5f..a27498b5e2 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -102,6 +102,23 @@
</section>
+<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/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index fd41e2cbeb..000c6e1ce7 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -74,6 +74,21 @@
</section>
+<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>