From 218f84f6b7cca496d3100fcb3ba1b3f7fa2fc1ac Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 12 Oct 2018 17:12:09 +0200
Subject: Prepare release

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

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index fb3bd18a53..8a377a4d48 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,34 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug where the socket option 'pktoptions' caused a read
+	    of uninitialized memory has been fixed. Would cause
+	    malfunction on FreeBSD.</p>
+          <p>
+	    Own Id: OTP-14297 Aux Id: OTP-15141 </p>
+        </item>
+        <item>
+	    <p>Fixed a memory leak on errors when reading files.</p>
+          <p>
+	    Own Id: OTP-15318</p>
+        </item>
+        <item>
+	    <p>File access through UNC paths works again on Windows.
+	    This regression was introduced in OTP 21.</p>
+          <p>
+	    Own Id: OTP-15333 Aux Id: ERL-737 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 5b187b1f4d..01c19aff2f 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.1
+VSN = 10.1.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3