aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-01-31 13:54:43 +0100
committerBjörn Gustavsson <[email protected]>2012-02-01 15:25:28 +0100
commit135c76d6b80182d5c441ef0e07e2f271dcad8aed (patch)
tree5d666e55a77e106e5e9d2e9575da754f24d7fc3e
parent7e547ba8221e8e63e5afb62e802318b810f8fafb (diff)
downloadotp-135c76d6b80182d5c441ef0e07e2f271dcad8aed.tar.gz
otp-135c76d6b80182d5c441ef0e07e2f271dcad8aed.tar.bz2
otp-135c76d6b80182d5c441ef0e07e2f271dcad8aed.zip
Prepare release
-rw-r--r--erts/doc/src/notes.xml17
-rw-r--r--erts/vsn.mk2
2 files changed, 18 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 4cef9669dd..1a79263928 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 5.8.5.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ The <c>+scl</c> command line flag has been added. It can
+ be used for disabling compaction of scheduler load. For
+ more information see the <c>erl(1)</c> documentation.</p>
+ <p>
+ Own Id: OTP-9695</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 5.8.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 18799d2fba..224727b094 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
# %CopyrightEnd%
#
-VSN = 5.8.5
+VSN = 5.8.5.1
SYSTEM_VSN = R14B04
# Port number 4365 in 4.2