From 0dedcdefde3f5601453ab12faf2a65b616118333 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 25 Jun 2015 14:28:54 +0200
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 35e6e55e72..adc73ceae0 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,32 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 6.4.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fix garbage collection of literals in code purge</p>
+	    <p>During code purging and check_process_code, the
+	    checking of the binary reference embedded in the match
+	    binary state was omitted for the tracing tests. This
+	    would cause the binary match state to reference
+	    deallocated memory.</p>
+          <p>
+	    Own Id: OTP-12821</p>
+        </item>
+        <item>
+          <p>
+	    Fix a rare hanging of the VM seen to happen just after
+	    emulator start. Bug exists since R14.</p>
+          <p>
+	    Own Id: OTP-12859 Aux Id: seq12882 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 6.4.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 9e5aa999e6..b806cb0b7a 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 6.4.1
+VSN = 6.4.1.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3