Prepare release

9 files changed, 111 insertions, 6 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 19993968f4..99a9647cbb 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,29 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 13.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Comparisons between small numbers and pids or ports
+	    would in some edge cases say that the number was greater
+	    than the pid or port, violating the term order.</p>
+          <p>
+	    Own Id: OTP-18415</p>
+        </item>
+        <item>
+          <p>
+	    <c>process_info(Pid, status)</c> when <c>Pid /=
+	    self()</c> could return an erroneous result.</p>
+          <p>
+	    Own Id: OTP-18421 Aux Id: PR-6806 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 13.1.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 61f96bb101..620fd45b16 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 13.1.4
+VSN = 13.1.5
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 8627087e05..e8843e5895 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,32 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 8.2.1</title>
+  <section><title>Inets 8.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Ensure graceful shutdown</p>
+          <p>
+	    Own Id: OTP-18461 Aux Id: ERIERL-890 </p>
+        </item>
+        <item>
+          <p>
+	    Return type of the type specification for function
+	    <c>httpc:cookie_header/{1,2,3}</c> has been fixed from
+	    <c>-spec cookie_header(url()) -&gt; [{ field(), value()
+	    }] | {error, Reason}</c> to <c>-spec cookie_header(url())
+	    -&gt; { field(), value() } | {error, Reason}</c></p>
+          <p>
+	    Own Id: OTP-18462 Aux Id: GH-6846 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 8.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index ba50e95060..17c0f94f46 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 8.2.1
+INETS_VSN   = 8.2.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 1f0a018277..a2b1a24113 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,30 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.15.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With this change, ssh application does not crash when
+	    formatting some of info reports for unsuccessful
+	    connections.</p>
+          <p>
+	    Own Id: OTP-18386 Aux Id: PR-6611 </p>
+        </item>
+        <item>
+          <p>
+	    With this change, ssh does not log extensively long
+	    messages.</p>
+          <p>
+	    Own Id: OTP-18417 Aux Id: DAFH-1349,ERIERL-888,IA18357 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.15.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index a87b6ca4fb..7006614f6e 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.15.1
+SSH_VSN = 4.15.2
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 568feeec32..3415c2b380 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,32 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.8.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Maximize compatibility by ignoring change_cipher_spec
+	    during handshake even if middle_box_mode is not
+	    negotiated (mandated by client)</p>
+          <p>
+	    Own Id: OTP-18433 Aux Id: GH-6772 </p>
+        </item>
+        <item>
+          <p>
+	    Move assert of middlebox message after an
+	    hello_retry_request to maximize interoperability. Does
+	    not changes semantics of the protocol only allows
+	    unexpected message delay from server.</p>
+          <p>
+	    Own Id: OTP-18467 Aux Id: GH-6807 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.8.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 088de889ae..38752aa433 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.8.6
+SSL_VSN = 10.8.7
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 5b9ba0ed0b..b0a12220b7 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1 +1,8 @@
-OTP-18409
+OTP-18386
+OTP-18415
+OTP-18417
+OTP-18421
+OTP-18433
+OTP-18461
+OTP-18462
+OTP-18467