aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-10-16 15:13:11 +0200
committerErlang/OTP <[email protected]>2018-10-16 15:13:11 +0200
commitde1f4615af6f5c3cd67c655393f59edb592839f3 (patch)
tree115729e772f75ae14e938471737dd82b54c23430
parent6965ac876714c5ca9ae00d48c0018f157dbb27f4 (diff)
downloadotp-de1f4615af6f5c3cd67c655393f59edb592839f3.tar.gz
otp-de1f4615af6f5c3cd67c655393f59edb592839f3.tar.bz2
otp-de1f4615af6f5c3cd67c655393f59edb592839f3.zip
Prepare release
-rw-r--r--erts/doc/src/notes.xml18
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/eldap/doc/src/notes.xml16
-rw-r--r--lib/eldap/vsn.mk2
-rw-r--r--make/otp_version_tickets2
5 files changed, 38 insertions, 2 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 4913b0f204..a0c7defd54 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 9.3.3.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed bug in <c>ets:select_replace</c> when called with a
+ fully bound key could cause a following call to
+ <c>ets:next</c> or <c>ets:prev</c> to crash the emulator
+ or return invalid result.</p>
+ <p>
+ Own Id: OTP-15346</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 9.3.3.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 6accb39b7a..3fc0d8646e 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 9.3.3.3
+VSN = 9.3.3.4
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 8b066671ee..915148b4a2 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,6 +31,22 @@
</header>
<p>This document describes the changes made to the Eldap application.</p>
+<section><title>Eldap 1.2.3.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ A race condition at close could cause the eldap client to
+ exit with a badarg message as cause.</p>
+ <p>
+ Own Id: OTP-15342 Aux Id: ERIERL-242 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Eldap 1.2.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 1636b6bb6d..a420db3e58 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.3
+ELDAP_VSN = 1.2.3.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
new file mode 100644
index 0000000000..3342ec82bf
--- /dev/null
+++ b/make/otp_version_tickets
@@ -0,0 +1,2 @@
+OTP-15342
+OTP-15346