aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-08-11 16:05:13 +0200
committerRickard Green <[email protected]>2018-08-11 16:05:13 +0200
commit503f6c802b2561881e0d4a62b32d7ee71575f319 (patch)
tree59d14d3d0ce39237093c3509b52ac506b355974c /erts
parentce0c75c557bdc239622a6de5ec2edb593baf4773 (diff)
parente37eec271ad08a6689e358071eeb800674cde938 (diff)
downloadotp-503f6c802b2561881e0d4a62b32d7ee71575f319.tar.gz
otp-503f6c802b2561881e0d4a62b32d7ee71575f319.tar.bz2
otp-503f6c802b2561881e0d4a62b32d7ee71575f319.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Update release notes Update version numbers
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml35
-rw-r--r--erts/vsn.mk2
2 files changed, 36 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 0363bcf65a..6b4db48f61 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,41 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 10.0.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed a bug which caused an emulator crash when
+ <c>enif_send()</c> was called by a NIF that executed on a
+ dirty scheduler. The bug was either triggered when the
+ NIF called <c>enif_send()</c> without a message
+ environment, or when the process executing the NIF was
+ <c>send</c> traced.</p>
+ <p>
+ Own Id: OTP-15223</p>
+ </item>
+ <item>
+ <p>
+ Fixed a bug causing some Erlang references to be
+ inconsistently ordered. This could for example cause
+ failure to look up certain elements with references as
+ keys in search data structures. This bug was introduced
+ in R13B02.</p>
+ <p>
+ Thanks to Simon Cornish for finding the bug and supplying
+ a fix.</p>
+ <p>
+ *** POTENTIAL INCOMPATIBILITY ***</p>
+ <p>
+ Own Id: OTP-15225</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 10.0.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index ac464ea165..c0444fa483 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.0.4
+VSN = 10.0.5
# Port number 4365 in 4.2
# Port number 4366 in 4.3