From 513df5fb5a2d51146f409141f9eb8736935cc486 Mon Sep 17 00:00:00 2001
From: costan <costan@google.com>
Date: Wed, 28 Jun 2017 14:23:16 -0700
Subject: [PATCH] Tag open source release 1.1.5.

---
 CMakeLists.txt |  2 +-
 NEWS           | 13 +++++++++++++
 configure.ac   |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec0a44..2c79e46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
-PROJECT(Snappy VERSION 1.1.4 LANGUAGES C CXX)
+PROJECT(Snappy VERSION 1.1.5 LANGUAGES C CXX)
 
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
diff --git a/NEWS b/NEWS
index 3bc0f4b..9c65957 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Snappy v1.1.5, June 28th 2017:
+
+  * Add CMake build support. The autoconf build support is now deprecated, and
+    will be removed in the next release.
+
+  * Add AppVeyor configuration, for Windows CI coverage.
+
+  * Small performance improvement on little-endian PowerPC.
+
+  * Small performance improvement on LLVM with position-independent executables.
+
+  * Fix a few issues with various build environments.
+
 Snappy v1.1.4, January 25th 2017:
 
   * Fix a 1% performance regression when snappy is used in PIE executables.
diff --git a/configure.ac b/configure.ac
index d3441b8..fd1e8f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 m4_define([snappy_major], [1])
 m4_define([snappy_minor], [1])
-m4_define([snappy_patchlevel], [4])
+m4_define([snappy_patchlevel], [5])
 
 # Libtool shared library interface versions (current:revision:age)
 # Update this value for every release!  (A:B:C will map to foo.so.(A-C).C.B)
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-m4_define([snappy_ltversion], [4:1:3])
+m4_define([snappy_ltversion], [4:1:4])
 
 AC_INIT([snappy], [snappy_major.snappy_minor.snappy_patchlevel])
 AC_CONFIG_MACRO_DIR([m4])