Merge branch 'maint'

* maint:
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION
#	make/otp_version_tickets_in_merge

4 files changed, 20 insertions, 70 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index d570d7d184..1200afce20 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,24 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 11.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix emulator crash when sending small bit-strings over
+	    Erlang distribution while the connection is being setup.</p>
+          <p>
+	    The fault was introduced in OTP-23.0</p>
+          <p>
+	    Own Id: OTP-17083 Aux Id: ERIERL-572 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 11.1.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index f78b169ecb..5cf93de819 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 11.1.4
+VSN = 11.1.5
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index b6fc5c1aca..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1,69 +0,0 @@
-OTP-15126
-OTP-16267
-OTP-16277
-OTP-16445
-OTP-16460
-OTP-16529
-OTP-16607
-OTP-16649
-OTP-16762
-OTP-16799
-OTP-16819
-OTP-16849
-OTP-16859
-OTP-16863
-OTP-16864
-OTP-16869
-OTP-16873
-OTP-16888
-OTP-16889
-OTP-16893
-OTP-16894
-OTP-16899
-OTP-16900
-OTP-16908
-OTP-16920
-OTP-16921
-OTP-16922
-OTP-16923
-OTP-16931
-OTP-16932
-OTP-16941
-OTP-16948
-OTP-16954
-OTP-16956
-OTP-16976
-OTP-16983
-OTP-16989
-OTP-16990
-OTP-16993
-OTP-17008
-OTP-17012
-OTP-17013
-OTP-17018
-OTP-17019
-OTP-17022
-OTP-17025
-OTP-17027
-OTP-17029
-OTP-17030
-OTP-17033
-OTP-17034
-OTP-17038
-OTP-17039
-OTP-17045
-OTP-17046
-OTP-17047
-OTP-17054
-OTP-17055
-OTP-17056
-OTP-17058
-OTP-17060
-OTP-17061
-OTP-17065
-OTP-17066
-OTP-17067
-OTP-17068
-OTP-17069
-OTP-17070
-OTP-17072
diff --git a/otp_versions.table b/otp_versions.table
index 802e8a99dd..2170ca7847 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-23.2.1 : erts-11.1.5 # asn1-5.0.14 common_test-1.19.1 compiler-7.6.6 crypto-4.8.1 debugger-5.0 dialyzer-4.3 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0.2 erl_interface-4.0.1 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 inets-7.3.1 jinterface-1.11 kernel-7.2 megaco-3.19.4 mnesia-4.18.1 observer-2.9.5 odbc-2.13.1 os_mon-2.6.1 parsetools-2.2 public_key-1.9.2 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 snmp-5.7 ssh-4.10.6 ssl-10.2 stdlib-3.14 syntax_tools-2.4 tftp-1.0.2 tools-3.4.2 wx-1.9.2 xmerl-1.3.26 :
 OTP-23.2 : common_test-1.19.1 compiler-7.6.6 crypto-4.8.1 dialyzer-4.3 erl_docgen-1.0.2 erts-11.1.4 inets-7.3.1 kernel-7.2 megaco-3.19.4 mnesia-4.18.1 public_key-1.9.2 snmp-5.7 ssh-4.10.6 ssl-10.2 stdlib-3.14 syntax_tools-2.4 tools-3.4.2 wx-1.9.2 xmerl-1.3.26 # asn1-5.0.14 debugger-5.0 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_interface-4.0.1 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 jinterface-1.11 observer-2.9.5 odbc-2.13.1 os_mon-2.6.1 parsetools-2.2 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 tftp-1.0.2 :
 OTP-23.1.5 : ssh-4.10.5 # asn1-5.0.14 common_test-1.19 compiler-7.6.5 crypto-4.8 debugger-5.0 dialyzer-4.2.1 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0.1 erl_interface-4.0.1 erts-11.1.3 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 inets-7.3 jinterface-1.11 kernel-7.1 megaco-3.19.3 mnesia-4.18 observer-2.9.5 odbc-2.13.1 os_mon-2.6.1 parsetools-2.2 public_key-1.9.1 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 snmp-5.6.1 ssl-10.1 stdlib-3.13.2 syntax_tools-2.3.1 tftp-1.0.2 tools-3.4.1 wx-1.9.1 xmerl-1.3.25 :
 OTP-23.1.4 : ssh-4.10.4 # asn1-5.0.14 common_test-1.19 compiler-7.6.5 crypto-4.8 debugger-5.0 dialyzer-4.2.1 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0.1 erl_interface-4.0.1 erts-11.1.3 et-1.6.4 eunit-2.6 ftp-1.0.5 hipe-4.0.1 inets-7.3 jinterface-1.11 kernel-7.1 megaco-3.19.3 mnesia-4.18 observer-2.9.5 odbc-2.13.1 os_mon-2.6.1 parsetools-2.2 public_key-1.9.1 reltool-0.8 runtime_tools-1.15.1 sasl-4.0.1 snmp-5.6.1 ssl-10.1 stdlib-3.13.2 syntax_tools-2.3.1 tftp-1.0.2 tools-3.4.1 wx-1.9.1 xmerl-1.3.25 :