From 9de6ee28200148b128f773a218d05ab70aa6ef56 Mon Sep 17 00:00:00 2001
From: agiardullo <agiardullo@fb.com>
Date: Thu, 16 Jul 2015 17:33:45 -0700
Subject: [PATCH] Tag 3.12.1

---
 HISTORY.md                | 3 +++
 include/rocksdb/version.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 7eced978..1cfa9a47 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,8 @@
 # Rocksdb Change Log
 
+## 3.12.1 (7/16/2015)
+* Fix data loss after DB recovery by not allowing flush/compaction to be scheduled until DB opened
+
 ## 3.12.0 (7/2/2015)
 ### New Features
 * Added experimental support for optimistic transactions.  See include/rocksdb/utilities/optimistic_transaction.h for more info.
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index d2536494..8ace456e 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 3
 #define ROCKSDB_MINOR 12
-#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
-- 
2.47.3