aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-09-07 17:49:29 +0200
committerErlang/OTP <[email protected]>2015-09-07 17:49:29 +0200
commitfa30eeeb6f54bb0421a76a321f77b9163dca8de9 (patch)
treeba74d4af66621dfd279803806bacf04b941bc715
parent5794d3d4bf28a33be1e6c802d709c305f23773c0 (diff)
downloadotp-fa30eeeb6f54bb0421a76a321f77b9163dca8de9.tar.gz
otp-fa30eeeb6f54bb0421a76a321f77b9163dca8de9.tar.bz2
otp-fa30eeeb6f54bb0421a76a321f77b9163dca8de9.zip
Prepare release
-rw-r--r--erts/doc/src/notes.xml17
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/debugger/doc/src/notes.xml16
-rw-r--r--lib/debugger/vsn.mk2
4 files changed, 35 insertions, 2 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 5682b9254c..cc224bee49 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,23 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 6.4.1.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ When tracing with <c>process_dump</c> option, the VM
+ could abort if there was an ongoing binary match
+ somewhere in the call stack of the traced process./</p>
+ <p>
+ Own Id: OTP-12968</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 6.4.1.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 35f40995d5..b8f4cf6946 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
# %CopyrightEnd%
#
-VSN = 6.4.1.2
+VSN = 6.4.1.3
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 7384189a6f..5a028fa4de 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -32,6 +32,22 @@
<p>This document describes the changes made to the Debugger
application.</p>
+<section><title>Debugger 4.0.3.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix crash when starting a quick debugging session. Thanks
+ Alan Duffield.</p>
+ <p>
+ Own Id: OTP-12911 Aux Id: seq12906 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Debugger 4.0.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index b82f0f4e37..c8321de297 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.0.3
+DEBUGGER_VSN = 4.0.3.1