Bump the version to 3.11.2

diff --git a/HISTORY.md b/HISTORY.md
index cad6fc08b9ef567e1a4a15532672b687f1d82bbe..2a523678d88fbe74a3e373a1976ffc8a352b62b6 100644 (file)
--- 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 a350b522616e2e8869ae0341b807de5b94edfaea..26086b22641bfea3123a9e2127769945b8476366 100644 (file)
--- 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