aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-06-30 11:53:41 +0200
committerErlang/OTP <[email protected]>2015-06-30 11:53:41 +0200
commitc97e4fb7f534d4c206e0446ddeeec0f47c57f81c (patch)
tree37d6c5dea97316da48ce79991ffcbe42c47af91e /erts
parentd8765c20ceb9dbb4f711e0b256cc201f5e422e77 (diff)
downloadotp-c97e4fb7f534d4c206e0446ddeeec0f47c57f81c.tar.gz
otp-c97e4fb7f534d4c206e0446ddeeec0f47c57f81c.tar.bz2
otp-c97e4fb7f534d4c206e0446ddeeec0f47c57f81c.zip
Prepare release
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml16
-rw-r--r--erts/vsn.mk2
2 files changed, 17 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 2d96ed6105..64de3aa622 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,22 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 7.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix a rare hanging of the VM seen to happen just after
+ emulator start. Bug exists since R14.</p>
+ <p>
+ Own Id: OTP-12859 Aux Id: seq12882 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 7.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 1012f5eafd..985834a801 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 7.0
+VSN = 7.0.1
# Port number 4365 in 4.2
# Port number 4366 in 4.3