update history and bump patch number

diff --git a/HISTORY.md b/HISTORY.md
index f876015903319dcaea2fddd5162f2029c28824e5..fec7c4ea0219139c294fdda657ff692cba429747 100644 (file)
--- 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 ad57fffde3e1598a77cd68056c6be8e6bc2a1273..feb003d3ccd06020513a1c9efe43d1d85958b05e 100644 (file)
--- 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