aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-08-25 13:13:20 +0200
committerHenrik Nord <[email protected]>2017-08-25 13:13:20 +0200
commit3bc5c3b35b3151143dffe94290c9ddf29b1b10d6 (patch)
tree74c0402d867c894fe829649062e10f6cf5ba08fa /erts
parent55acf245c53b1a4b36ea4514bdc93b3acba699a1 (diff)
parenta230f26086b3db9097f06d4bb91fb3b2e9379c77 (diff)
downloadotp-3bc5c3b35b3151143dffe94290c9ddf29b1b10d6.tar.gz
otp-3bc5c3b35b3151143dffe94290c9ddf29b1b10d6.tar.bz2
otp-3bc5c3b35b3151143dffe94290c9ddf29b1b10d6.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release dialyzer: Fix a bug where merging PLT:s could lose info
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml32
-rw-r--r--erts/vsn.mk2
2 files changed, 33 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 3d7858a034..f6bc6e984b 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,38 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 9.0.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ A timer internal bit-field used for storing scheduler id
+ was too small. As a result, VM internal timer data
+ structures could become inconsistent when using 1024
+ schedulers on the system. Note that systems with less
+ than 1024 schedulers are not effected by this bug.</p>
+ <p>
+ This bug was introduced in ERTS version 7.0 (OTP 18.0).</p>
+ <p>
+ Own Id: OTP-14548 Aux Id: OTP-11997, ERL-468 </p>
+ </item>
+ <item>
+ <p>
+ Automatic cleanup of a BIF timer, when the owner process
+ terminated, could race with the timeout of the timer.
+ This could cause the VM internal data structures to
+ become inconsistent which very likely caused a VM crash.</p>
+ <p>
+ This bug was introduced in ERTS version 9.0 (OTP 20.0).</p>
+ <p>
+ Own Id: OTP-14554 Aux Id: OTP-14356, ERL-468 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 9.0.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index f90870b7c8..8ed3993177 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 9.0.3
+VSN = 9.0.4
# Port number 4365 in 4.2
# Port number 4366 in 4.3