From 26b95bfaf19f7b878412829d638b8abf8be7374d Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 20 Dec 2018 13:26:58 +0100
Subject: Prepare release

---
 erts/doc/src/notes.xml    | 39 +++++++++++++++++++++++++++
 erts/vsn.mk               |  2 +-
 lib/ssl/doc/src/notes.xml | 21 +++++++++++++++
 lib/ssl/vsn.mk            |  2 +-
 make/otp_version_tickets  | 68 +++--------------------------------------------
 5 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a34b3edd7a..2527a847d2 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,45 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug on big endian architectures when changing file
+	    permissions or ownership with <c>file:change_mode</c>,
+	    <c>change_owner</c>, <c>change_group</c> or
+	    <c>write_file_info</c>. Bug exists since OTP-21.0.</p>
+          <p>
+	    Own Id: OTP-15485</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>atomics</c> with option
+	    <c>{signed,false}</c> when returned values are <c>(1 bsl
+	    63)</c> or larger. Could cause heap corruption leading to
+	    VM crash or other unpleasant symptoms. Bug exists since
+	    OTP-21.2 when module <c>atomics</c> was introduced.</p>
+          <p>
+	    Own Id: OTP-15486 Aux Id: PR-2061 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in operator <c>band</c> of two negative
+	    operands causing erroneous result if the absolute value
+	    of one of the operands have the lowest <c>N*W</c> bits as
+	    zero and the other absolute value is not larger than
+	    <c>N*W</c> bits. <c>N</c> is an integer of 1 or larger
+	    and <c>W</c> is 32 or 64 depending on word size.</p>
+          <p>
+	    Own Id: OTP-15487 Aux Id: ERL-804 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 0adee946cc..73199cc721 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.2
+VSN = 10.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 48372babf8..854ab31883 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,27 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 9.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed renegotiation bug. Client did not handle server
+	    initiated renegotiation correctly after rewrite to two
+	    connection processes, due to ERL-622 commit
+	    d87ac1c55188f5ba5cdf72384125d94d42118c18. This could
+	    manifest it self as a " bad_record_mac" alert.</p>
+          <p>
+	    Also included are some optimizations</p>
+          <p>
+	    Own Id: OTP-15489 Aux Id: ERL-308 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 9.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 75d959accf..3501622f5a 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.1
+SSL_VSN = 9.1.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 81a6fb9117..d5d7c3521f 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,64 +1,4 @@
-OTP-12242
-OTP-13468
-OTP-14669
-OTP-15094
-OTP-15121
-OTP-15245
-OTP-15302
-OTP-15312
-OTP-15314
-OTP-15338
-OTP-15339
-OTP-15341
-OTP-15343
-OTP-15346
-OTP-15357
-OTP-15360
-OTP-15364
-OTP-15365
-OTP-15368
-OTP-15371
-OTP-15377
-OTP-15378
-OTP-15384
-OTP-15387
-OTP-15388
-OTP-15389
-OTP-15391
-OTP-15400
-OTP-15402
-OTP-15412
-OTP-15413
-OTP-15415
-OTP-15416
-OTP-15418
-OTP-15419
-OTP-15420
-OTP-15424
-OTP-15426
-OTP-15428
-OTP-15435
-OTP-15436
-OTP-15437
-OTP-15446
-OTP-15449
-OTP-15450
-OTP-15453
-OTP-15454
-OTP-15461
-OTP-15463
-OTP-15464
-OTP-15465
-OTP-15466
-OTP-15467
-OTP-15469
-OTP-15470
-OTP-15471
-OTP-15472
-OTP-15473
-OTP-15474
-OTP-15475
-OTP-15476
-OTP-15478
-OTP-15481
-OTP-15482
+OTP-15485
+OTP-15486
+OTP-15487
+OTP-15489
-- 
cgit v1.2.3