aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-06-13 10:28:55 +0200
committerJohn Högberg <[email protected]>2019-06-13 10:28:55 +0200
commit8fb03c024165d6777f429e495af676dfe020e78a (patch)
treef536bfadf844d2dcd0c6bd14a361c0e09b1ca305 /erts
parent898b9b35f2cad1e925ea658d2dc381c5bde01829 (diff)
parentb4fb2e5669acb02697d9a9ab168eb0fbff6f370c (diff)
downloadotp-8fb03c024165d6777f429e495af676dfe020e78a.tar.gz
otp-8fb03c024165d6777f429e495af676dfe020e78a.tar.bz2
otp-8fb03c024165d6777f429e495af676dfe020e78a.zip
Merge branch 'maint-22' into maint
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml33
-rw-r--r--erts/vsn.mk2
2 files changed, 34 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 79cb37a341..df77ce181e 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,39 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 10.4.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed <c>process_info(Pid,reductions)</c> to not
+ categorically increase reduction count of the measured
+ process <c>Pid</c>. Repeated reduction measure of an idle
+ process will most often (but not guaranteed) return the
+ same value, like it behaved before OTP 21.3.8.</p>
+ <p>
+ Own Id: OTP-15865 Aux Id: ERL-964 </p>
+ </item>
+ <item>
+ <p>Fixed an incorrect load-time optimization that could
+ cause a crash when extracting deeply nested tuple
+ elements.</p>
+ <p>
+ Own Id: OTP-15871 Aux Id: ERIERL-374 </p>
+ </item>
+ <item>
+ <p>
+ Fix bug causing VM crash when pressing P for "proc info"
+ in Erlang shell break menu. Bug exists since OTP 22.0.</p>
+ <p>
+ Own Id: OTP-15873 Aux Id: ERL-965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 10.4.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 4d8282bf15..53dce5e815 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.4.1
+VSN = 10.4.2
# Port number 4365 in 4.2
# Port number 4366 in 4.3