From 304fef65a147b53234d8d8ad8889ffa79d7ef45b Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 28 Apr 2017 15:11:53 +0200
Subject: Prepare release

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

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 27a369660c..11206d43e7 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,31 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 8.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed memory segment cache used for multiblock carriers.
+	    Huge (> 2GB) memory segments could cause a VM crash.
+	    Creation of such huge memory segments used for multiblock
+	    carriers is however very uncommon.</p>
+          <p>
+	    Own Id: OTP-14360 Aux Id: ERL-401, PR-1417 </p>
+        </item>
+        <item>
+          <p>
+	    Fix release note for OTP-14290 in ERTS version 8.3.1. It
+	    was erroneously placed under "Known Bugs and Problems".</p>
+          <p>
+	    Own Id: OTP-14363 Aux Id: OTP-14290 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 29323dd970..a83c1ab761 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 8.3.2
+VSN = 8.3.3
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3