summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSagar Vemuri <svemuri@fb.com>2018-03-23 11:39:50 -0700
committerSagar Vemuri <svemuri@fb.com>2018-03-23 11:39:50 -0700
commit8969445642039566214d650cc6614849e7dd5e17 (patch)
treeac7eb51f9c8a8e8d00b1d63e99507dc191642b61
parent250d2a67915b2a2ce02f7acc175a9de2614a9ee6 (diff)
Update history and bump patch numberv5.12.2
-rw-r--r--HISTORY.md3
-rw-r--r--include/rocksdb/version.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 9fb7ce9eb..18b6a5ab2 100644
--- 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 feb003d3c..92268158a 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 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