aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-04-01 15:21:50 +0200
committerSverker Eriksson <[email protected]>2019-04-01 15:21:50 +0200
commitabc64999241276879208d077f9d94101366a414e (patch)
treec2e4e776415cf972508ae3e8beadbb3b677ecd80 /erts
parent97bd138d220bcb863a7e09dd420f879137c09a6c (diff)
parent1feae54b6a313f7a35ca1671e3c50f8b434a1bb0 (diff)
downloadotp-abc64999241276879208d077f9d94101366a414e.tar.gz
otp-abc64999241276879208d077f9d94101366a414e.tar.bz2
otp-abc64999241276879208d077f9d94101366a414e.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml22
-rw-r--r--erts/vsn.mk2
2 files changed, 23 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 9e5afd57a2..4c70101358 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,28 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 10.3.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>Fixed a bug in <c>seq_trace:reset_trace/0</c> that
+ could crash the emulator.</p>
+ <p>
+ Own Id: OTP-15704</p>
+ </item>
+ <item>
+ <p>
+ Fixed bug in <c>process_info(reductions)</c> causing it
+ to sometimes return invalid results.</p>
+ <p>
+ Own Id: OTP-15709 Aux Id: ERIERL-337 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 10.3.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 3942af7f78..bce5ce4167 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.3.1
+VSN = 10.3.2
# Port number 4365 in 4.2
# Port number 4366 in 4.3