diff options
author | Erlang/OTP <[email protected]> | 2014-04-10 04:46:19 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2014-04-10 04:46:19 +0200 |
commit | c6237ad7b6b485990f915daa2b1cf0a9095f129d (patch) | |
tree | c464fa53980f7ae80edcf34ac2d560eca4399fa8 /erts | |
parent | 1ad2e2afcfab28e79de3ac954e38f918ac1274e3 (diff) | |
download | otp-c6237ad7b6b485990f915daa2b1cf0a9095f129d.tar.gz otp-c6237ad7b6b485990f915daa2b1cf0a9095f129d.tar.bz2 otp-c6237ad7b6b485990f915daa2b1cf0a9095f129d.zip |
Prepare release
Diffstat (limited to 'erts')
-rw-r--r-- | erts/doc/src/notes.xml | 23 | ||||
-rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index eba4cdf06f..68feaa027a 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -30,6 +30,29 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 6.0.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix broken system monitoring of <c>large_heap</c> for + non-smp VM. No message for <c>large_heap</c> was ever + sent on non-smp VM. Bug exist since R16B.</p> + <p> + Own Id: OTP-11852</p> + </item> + <item> + <p> + Fixed type spec of <c>erlang:system_info/1</c>.</p> + <p> + Own Id: OTP-11859 Aux Id: OTP-11615 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 6.0</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 081fb66398..a108b1d100 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,7 +17,7 @@ # %CopyrightEnd% # -VSN = 6.0 +VSN = 6.0.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |