From: Igor Canadi <icanadi@fb.com>
Date: Thu, 11 Jun 2015 22:49:11 +0000 (-0700)
Subject: Bump the version to 3.11.2
X-Git-Tag: rocksdb-3.11.2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=add2ac5fb826463e5525a3e3b1a4a1714dfbeffb;p=rocksdb.git

Bump the version to 3.11.2
---

diff --git a/HISTORY.md b/HISTORY.md
index cad6fc08..2a523678 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,11 @@
 # Rocksdb Change Log
 
+## 3.11.2 (6/11/2015)
+
+### Fixes
+* Adjust the way we compensate for tombstones when chosing compactions. Previous heuristics led to pathological behavior in some cases.
+* Don't let two L0->L1 compactions run in parallel (only affected through experimental feature SuggestCompactRange)
+
 ## 3.11.1 (6/1/2015)
 
 ### Changes
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index a350b522..26086b22 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 3
 #define ROCKSDB_MINOR 11
-#define ROCKSDB_PATCH 1
+#define ROCKSDB_PATCH 2
 
 // 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