From e3c71d353e884316420eebea2d7ef802c651437b Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 15 Nov 2018 12:26:12 +0100
Subject: Prepare release

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

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 8a377a4d48..5dabb2adf9 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 10.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a rare bug where files could be closed on a
+	    normal instead of an IO scheduler, resulting in system
+	    instability if the operation blocked.</p>
+          <p>
+	    Own Id: OTP-15421</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 01c19aff2f..241d5a3b85 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.1.1
+VSN = 10.1.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3