From cf3a0e070149b7911026ff75477e4969f4396e03 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 2 Jun 2017 10:38:16 +0200
Subject: Update version numbers

---
 erts/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/vsn.mk b/erts/vsn.mk
index a83c1ab761..dc17ed8b3d 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 8.3.3
+VSN = 8.3.4
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3


From 984d9f66c0cdff91a599e8a1e332c85bbadb9b37 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 2 Jun 2017 10:38:30 +0200
Subject: Update release notes

---
 erts/doc/src/notes.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 11206d43e7..35d7381cf3 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,26 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 8.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add option to make SIGTERM trigger the OS default
+	    behaviour instead of doing a gracefull shutdown. To
+	    activate this bahviour the environment variable
+	    ERL_ZZ_SIGTERM_KILL should be set to "true". This option
+	    only works in OTP 19 as OTP 20 will have a different way
+	    to deal with SIGTERM.</p>
+          <p>
+	    Own Id: OTP-14418 Aux Id: ERIERL-15 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3