diff options
| author | Sverker Eriksson <[email protected]> | 2015-06-30 15:45:56 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-06-30 15:45:56 +0200 |
| commit | 2e3a43ec4d0ce5e1055377ff32198017a1d083b4 (patch) | |
| tree | 4ec301687d0a312922390fa409318d54930ad0ac /erts | |
| parent | 2e36a5f144ff1c996f02d5a55b07f3c840869ebf (diff) | |
| parent | 1c14bf099be15790ccbe56f464e81a9557476b3f (diff) | |
| download | otp-2e3a43ec4d0ce5e1055377ff32198017a1d083b4.tar.gz otp-2e3a43ec4d0ce5e1055377ff32198017a1d083b4.tar.bz2 otp-2e3a43ec4d0ce5e1055377ff32198017a1d083b4.zip | |
Merge branch 'maint-18' into maint
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
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 |