From 48eedeb93db5552164bb3675f139377f5dd2fd7d Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 18 Mar 2019 18:02:35 +0100
Subject: Prepare release

---
 lib/erl_interface/doc/src/notes.xml | 20 ++++++++++++++++++++
 lib/erl_interface/vsn.mk            |  2 +-
 lib/ssl/doc/src/notes.xml           | 24 ++++++++++++++++++++++++
 lib/ssl/vsn.mk                      |  2 +-
 4 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index b686cfbf33..32d28b853b 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,26 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.11.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed two bugs in the <c>erl_call</c> program. A missing
+	    initialization (introduced in <c>erl_interface-3.11</c>)
+	    which either caused a crash or failure to connect to or
+	    start a node, and an incorrectly calculated timeout which
+	    could cause failure to start an erlang node. These bugs
+	    only caused failures on some platforms.</p>
+          <p>
+	    Own Id: OTP-15676 Aux Id: OTP-15442, ERL-881 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.11</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 0ed5c07bca..dae6052d55 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.11
+EI_VSN = 3.11.1
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 874c5dd11d..b036463e87 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,30 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 9.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The timeout for a passive receive was sometimes not
+	    cancelled and later caused a server crash. This bug has
+	    now been corrected.</p>
+          <p>
+	    Own Id: OTP-14701 Aux Id: ERL-883, ERL-884 </p>
+        </item>
+        <item>
+          <p>
+	    Add tag for passive message (active N) in cb_info to
+	    retain transport transparency.</p>
+          <p>
+	    Own Id: OTP-15679 Aux Id: ERL-861 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 0d9f907d5c..c4bcc1560c 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.2
+SSL_VSN = 9.2.1
-- 
cgit v1.2.3