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 +-
 make/otp_version_tickets            | 82 ++-----------------------------------
 5 files changed, 49 insertions(+), 81 deletions(-)

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
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 77633c2ce2..cfd555fd49 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,79 +1,3 @@
-OTP-14702
-OTP-15229
-OTP-15298
-OTP-15369
-OTP-15375
-OTP-15398
-OTP-15423
-OTP-15442
-OTP-15445
-OTP-15447
-OTP-15460
-OTP-15479
-OTP-15484
-OTP-15490
-OTP-15493
-OTP-15494
-OTP-15498
-OTP-15502
-OTP-15503
-OTP-15508
-OTP-15514
-OTP-15518
-OTP-15519
-OTP-15527
-OTP-15529
-OTP-15539
-OTP-15540
-OTP-15541
-OTP-15542
-OTP-15545
-OTP-15552
-OTP-15553
-OTP-15555
-OTP-15556
-OTP-15557
-OTP-15558
-OTP-15561
-OTP-15562
-OTP-15567
-OTP-15569
-OTP-15570
-OTP-15572
-OTP-15576
-OTP-15577
-OTP-15578
-OTP-15580
-OTP-15583
-OTP-15584
-OTP-15586
-OTP-15587
-OTP-15592
-OTP-15599
-OTP-15600
-OTP-15601
-OTP-15602
-OTP-15604
-OTP-15605
-OTP-15619
-OTP-15624
-OTP-15625
-OTP-15629
-OTP-15630
-OTP-15634
-OTP-15637
-OTP-15639
-OTP-15642
-OTP-15647
-OTP-15650
-OTP-15654
-OTP-15657
-OTP-15659
-OTP-15660
-OTP-15662
-OTP-15663
-OTP-15665
-OTP-15666
-OTP-15667
-OTP-15669
-OTP-15670
+OTP-14701
+OTP-15676
+OTP-15679
-- 
cgit v1.2.3