From 7ee7b013bc5d7f045c5d8d8d63125fb3bdbb6b98 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 21 Oct 2014 12:32:51 +0200
Subject: Prepare release

---
 erts/doc/src/notes.xml | 28 ++++++++++++++++++++++++++++
 erts/vsn.mk            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 2fe8879b93..dd9e7507df 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,34 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.10.4.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Introduced support for eager check I/O.</p>
+	    <p>By default eager check I/O will be disabled, but this
+	    will most likely be changed in OTP 18. When eager check
+	    I/O is enabled, schedulers will more frequently check for
+	    I/O work. Outstanding I/O operation will however not be
+	    prioritized to the same extent as when eager check I/O is
+	    disabled.</p>
+	    <p>Eager check I/O can be enabled and disabled using the
+	    <c>erl</c> command line argument <seealso
+	    marker="erl#+secio"><c>+secio</c></seealso>.</p>
+	    <p>Characteristics impact when enabled:</p> <list>
+	    <item>Lower latency and smoother management of externally
+	    triggered I/O operations.</item> <item>A slightly reduced
+	    priority of externally triggered I/O operations.</item>
+	    </list>
+          <p>
+	    Own Id: OTP-12117</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.10.4.1</title>
 
     <section><title>Known Bugs and Problems</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index af74fb96c9..0b5ade5a7a 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 5.10.4.1
+VSN = 5.10.4.2
 SYSTEM_VSN = R16B03-1
 
 # Port number 4365 in 4.2
-- 
cgit v1.2.3