Prepare release

Erlang/OTP · Erlang/OTP · commit afcad0966e43 · 2021-05-10T12:32:16.000+02:00
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
@@ -31,6 +31,26 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 11.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug in match spec compilator seen to cause a stack
+	    overflow crash on debug VM for certain match specs. Could
+	    potentially cause problems for standard VM, but has not
+	    been verified. Match specs are used by
+	    <c>ets:match/select</c> functions and
+	    <c>erlang:trace_pattern</c>.</p>
+          <p>
+	    Own Id: OTP-17379 Aux Id: PR-4804 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 11.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 11.2.1
+VSN = 11.2.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,23 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.6.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Reverted the fix for <c>OTP-17357</c> as it turned out
+	    to be incomplete and made the validator reject much more
+	    legal code than before.</p> <p>It will be fixed more
+	    thoroughly in a later patch.</p>
+          <p>
+	    Own Id: OTP-17386 Aux Id: ERIERL-650, OTP-17357 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.6.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.6.8
+COMPILER_VSN = 7.6.9
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,29 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 2.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The unordered option was ignored on a client
+	    diameter_sctp transport, causing all delivery to be
+	    ordered.</p>
+          <p>
+	    The association id was not specified to gen_sctp when
+	    requesting unordered delivery, causing the setting to be
+	    applied to the whole endpoint.</p>
+          <p>
+	    Thanks to Bengt Kleberg and Andreas Schultz.</p>
+          <p>
+	    Own Id: OTP-17366 Aux Id: GH-4775 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 2.2.3
+DIAMETER_VSN = 2.2.4
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
@@ -1,6 +1,4 @@
 OTP-16607
-OTP-16930
-OTP-17347
-OTP-17357
-OTP-17358
-OTP-17361
+OTP-17366
+OTP-17379
+OTP-17386

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# %CopyrightEnd%`
`19`	`19`	`#`
`20`	`20`
`21`		`-VSN = 11.2.1`
	`21`	`+VSN = 11.2.2`
`22`	`22`
`23`	`23`	`# Port number 4365 in 4.2`
`24`	`24`	`# Port number 4366 in 4.3`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-COMPILER_VSN = 7.6.8`
	`1`	`+COMPILER_VSN = 7.6.9`