aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-12-07 15:43:41 +0100
committerHenrik Nord <[email protected]>2015-12-07 15:43:41 +0100
commita16b7d63cc665dca90305b146c15de04487808db (patch)
treeffdd695517b5f74e5a0123dd2ace905b6d3ddd73 /erts/doc/src
parent4cde96f8525f0c59f2037a981a4954da0224d224 (diff)
parent42493ad886f9b1b3e32e6f1bef084275a4480096 (diff)
downloadotp-a16b7d63cc665dca90305b146c15de04487808db.tar.gz
otp-a16b7d63cc665dca90305b146c15de04487808db.tar.bz2
otp-a16b7d63cc665dca90305b146c15de04487808db.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk otp_versions.table
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/notes.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index b4bdc5735c..5a65115cb2 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,7 +32,6 @@
<p>This document describes the changes made to the ERTS application.</p>
-
<section><title>Erts 7.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
@@ -982,6 +981,22 @@
</section>
+<section><title>Erts 6.4.1.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed a bug that could cause a crash dump to become
+ almost empty.</p>
+ <p>
+ Own Id: OTP-13150</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 6.4.1.4</title>
<section><title>Fixed Bugs and Malfunctions</title>