From: sdong <siying.d@fb.com>
Date: Tue, 30 Aug 2016 18:55:08 +0000 (-0700)
Subject: Increase version to 4.11.1
X-Git-Tag: rocksdb-4.11.2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f4c98d3056ee367714005440256fca50810e73b;p=rocksdb.git

Increase version to 4.11.1

Summary:
After back-porting two bug fixes, increase the version to 4.11.1
---

diff --git a/HISTORY.md b/HISTORY.md
index ea9227af..6ebf8cf6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,8 @@
 # Rocksdb Change Log
-## Unreleased
+## 4.11.1 (8/30/2016)
+### Bug Fixes
+* Mitigate the regression bug of deadlock condition during recovery when options.max_successive_merges hits.
+* Fix data race condition related to hash index in block based table when putting indexes in the block cache.
 
 ## 4.11.0 (8/1/2016)
 ### Public API Change
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 2c024aee..abdfe094 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 4
 #define ROCKSDB_MINOR 11
-#define ROCKSDB_PATCH 0
+#define ROCKSDB_PATCH 1
 
 // Do not use these. We made the mistake of declaring macros starting with
 // double underscore. Now we have to live with our choice. We'll deprecate these