aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-06-14 09:22:13 +0200
committerJohn Högberg <[email protected]>2018-06-14 09:22:13 +0200
commit6c10df2098cd626a2a2377523bbb04687f9dd7a2 (patch)
tree1c1c878d628c76239ae85150ce408c8a1abeb685 /erts
parent6d24188417dd1eb1dd663c472e64a222be59f8a9 (diff)
parent66ee6099501b44f52cb715b50d90ea64d05d70ab (diff)
downloadotp-6c10df2098cd626a2a2377523bbb04687f9dd7a2.tar.gz
otp-6c10df2098cd626a2a2377523bbb04687f9dd7a2.tar.bz2
otp-6c10df2098cd626a2a2377523bbb04687f9dd7a2.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Add test case Parse #mc_new_type{}s before definitions_loop/2 erts: Fix race between ets table deletion and auto-unfix
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml20
-rw-r--r--erts/vsn.mk2
2 files changed, 21 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index f7f86084a9..b9de00a8af 100644
--- 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 9.3.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed bug in <c>ets</c> that could cause VM crash if
+ process A terminates after fixating a table and process B
+ deletes the table at "the same time". The table fixation
+ could be done with <c>ets:safe_fixtable</c> or if process
+ A terminates in the middle of a long running
+ <c>select</c> or <c>match</c> call.</p>
+ <p>
+ Own Id: OTP-15109</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 9.3.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 687c62343e..9222b74f81 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 9.3.2
+VSN = 9.3.3
# Port number 4365 in 4.2
# Port number 4366 in 4.3