From b8dc58da77e4ccf3eb8c30c77b3924e27f89c6e4 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 15 Dec 2017 16:03:50 +0100
Subject: Prepare release

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

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index e1c8dbb501..2f2a527176 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,32 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 8.3.5.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in file closure on Unix; close(2) was
+	    retried on EINTR which could cause a different (recently
+	    opened) file to be closed as well.</p>
+          <p>
+	    Own Id: OTP-14775</p>
+        </item>
+        <item>
+          <p>
+	    A race-condition when tearing down a connection with
+	    active node monitors could cause the runtime system to
+	    crash.</p>
+          <p>
+	    This bug was introduced in ERTS version 8.0 (OTP 19.0).</p>
+          <p>
+	    Own Id: OTP-14781 Aux Id: OTP-13047 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3.5.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index e8fe09ad36..4484b0d54a 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 8.3.5.3
+VSN = 8.3.5.4
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3