From fb2a3412ea80327458fd26a7135c0039e38dc827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Mon, 2 Oct 2017 15:48:43 +0200
Subject: Fix zlib merge snafu

I accidentally merged a few fixes directly to maint-20 (and then to maint
and master), instead of merging to maint and master and waiting for a
patch to merge it into maint-20, leaving the related tickets dangling.

This commit does nothing beyond getting the tickets (and their release
notes) into the next patch.
---
 erts/preloaded/src/zlib.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl
index 611010550f..3170ab6351 100644
--- a/erts/preloaded/src/zlib.erl
+++ b/erts/preloaded/src/zlib.erl
@@ -692,4 +692,4 @@ enqueue_input_1(Z, IOVec) ->
     end.
 
 enqueue_nif(_Z, _IOVec) ->
-    erlang:nif_error(undef).
\ No newline at end of file
+    erlang:nif_error(undef).
-- 
cgit v1.2.3


From b584195a6befac314eef75ac3f1ae2ac4f448a61 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 2 Oct 2017 15:55:32 +0200
Subject: Prepare release

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

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 1a5bea8820..fa200176e4 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,30 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The new zlib module returned a data_error when
+	    inflating concatenated streams, which was incompatible
+	    with the old module's behavior of returning the
+	    uncompressed data up to the end of the first stream.</p>
+          <p>
+	    Own Id: OTP-14648</p>
+        </item>
+        <item>
+	    <p>zlib:gunzip/1 will no longer stop at the end of the
+	    first stream when decompressing concatenated gzip
+	    files.</p>
+          <p>
+	    Own Id: OTP-14649</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 380be1b534..1c6472a0ab 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 9.1
+VSN = 9.1.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3