aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-05-29 13:24:51 +0200
committerErlang/OTP <[email protected]>2019-05-29 13:24:51 +0200
commitc664548ad77ff24f7f7eb5ea1e8f2b0057e8889f (patch)
tree7102d80fba4b0526993e1275c780d5cdb66b5b35 /erts
parent797aca26c3bbf9004f8539433fc1a1a5c27db9fb (diff)
downloadotp-c664548ad77ff24f7f7eb5ea1e8f2b0057e8889f.tar.gz
otp-c664548ad77ff24f7f7eb5ea1e8f2b0057e8889f.tar.bz2
otp-c664548ad77ff24f7f7eb5ea1e8f2b0057e8889f.zip
Prepare release
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml17
-rw-r--r--erts/vsn.mk2
2 files changed, 18 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index aad7e27f80..ddf17097bd 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,23 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 10.4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>In nested use of <c>try</c>/<c>catch</c>, rethrowing
+ an exception using <c>erlang:raise/3</c> with a different
+ class would not always be able to change the class of the
+ exception.</p>
+ <p>
+ Own Id: OTP-15834 Aux Id: ERIERL-367 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 10.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 224570fb09..4d8282bf15 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.4
+VSN = 10.4.1
# Port number 4365 in 4.2
# Port number 4366 in 4.3