From: Zhongyi Xie <xiez@fb.com>
Date: Fri, 20 Apr 2018 21:16:35 +0000 (-0700)
Subject: bump version to 5.12.4 and update history
X-Git-Tag: v5.12.4^0
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc0a65f4286e3833d99833433d8b0c63ec7dbdfd;p=rocksdb.git

bump version to 5.12.4 and update history
---

diff --git a/HISTORY.md b/HISTORY.md
index ae49cd90..0105c107 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,7 @@
 ## 5.12.3 (04/09/2018)
 ### Bug Fixes
 * Fix memory leak when pin_l0_filter_and_index_blocks_in_cache is used with partitioned filters
+* Fix memory leak in two_level_iterator
 
 ## 5.12.2 (3/23/2018)
 ### Bug Fixes
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index f883d5a8..c0d21c1f 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 3
+#define ROCKSDB_PATCH 4
 
 // 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