Update history and bump patch number

diff --git a/HISTORY.md b/HISTORY.md
index 9fb7ce9eb672438e29786df5d91c3d928e9714c5..18b6a5ab2170cfae72fcaec83b83891b67827587 100644 (file)
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,9 @@
 ### Bug Fixes
 * Fsync after writing global seq number to the ingestion file in ExternalSstFileIngestionJob.
 
+### Java API Changes
+* Add `BlockBasedTableConfig.setBlockCache` to allow sharing a block cache across DB instances.
+
 ## 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 feb003d3ccd06020513a1c9efe43d1d85958b05e..92268158a09de93e994c863d86602686b4e27e77 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 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