From: Andrew Kryczka <andrewkr@fb.com>
Date: Fri, 16 Mar 2018 21:09:20 +0000 (-0700)
Subject: update history and bump patch number
X-Git-Tag: v5.12.2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4fc156fb8c6209765affe3ed0aa13a812fc08d2;p=rocksdb.git

update history and bump patch number
---

diff --git a/HISTORY.md b/HISTORY.md
index f87601590..fec7c4ea0 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,5 @@
 # Rocksdb Change Log
-## Unreleased
+## 5.12.1 (3/16/2018)
 ### Public API Change
 * RocksDBOptionsParser::Parse()'s `ignore_unknown_options` argument will only be effective if the option file shows it is generated using a higher version of RocksDB than the current version.
 
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index ad57fffde..feb003d3c 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 5
 #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