Prepare release

hzeus · Mar 16, 2022 · 4f29e14 · 4f29e14
1 parent 49300b6
commit 4f29e14
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 6 deletions.
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 5.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix compile error regarding <c>gethostbyaddr_r</c> on
+	    Android. Error introduced in OTP 24.3.</p>
+          <p>
+	    Own Id: OTP-17975 Aux Id: PR-5763 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 5.2</title>
 
     <section><title>Improvements and New Features</title>

diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 5.2
+EI_VSN = 5.2.1
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,30 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix failed accepted connection setup after previous
+	    established connection from same node closed down
+	    silently.</p>
+          <p>
+	    Own Id: OTP-17979 Aux Id: ERIERL-780 </p>
+        </item>
+        <item>
+	    <p>Fixed a problem where typing Ctrl-R in the shell could
+	    hang if there were some problem with the history log
+	    file.</p>
+          <p>
+	    Own Id: OTP-17981 Aux Id: PR-5791 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
@@ -55,7 +55,9 @@
   {<<"^8\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.2$">>,[restart_new_emulator]},
-  {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.3$">>,[restart_new_emulator]},
+  {<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
  [{<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -83,4 +85,6 @@
   {<<"^8\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.2$">>,[restart_new_emulator]},
-  {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.3$">>,[restart_new_emulator]},
+  {<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.3
+KERNEL_VSN = 8.3.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
@@ -1,2 +1,4 @@
-OTP-17963
-OTP-17971
+OTP-17975
+OTP-17979
+OTP-17981
+OTP-17982