Bump the version file to 6.15.2 and update HISTORY.md with fix information.

Also, fix a merge issue with .circleci/config.yml (missing
install-cmake-on-macos in commands section)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e42e1d34ce620126274ee4abedde4bd9af023363..b57ce42be961f40fdf321fea8dafcbdf0071adf1 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,6 +17,13 @@ commands:
           command: |
             HOMEBREW_NO_AUTO_UPDATE=1 brew install pyenv
 
+  install-cmake-on-macos:
+    steps:
+      - run:
+          name: Install cmake on macos
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake
+
   increase-max-open-files-on-macos:
     steps:
       - run:

diff --git a/HISTORY.md b/HISTORY.md
index 7bec0e440f9d376c27dfca4eb6419e18b72da759..ac9b95b65a4c095aa4d7ffe5d48790109c9700f3 100644 (file)
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,10 @@
 # Rocksdb Change Log
+## 6.15.2 (12/22/2020)
+### Bug Fixes
+* Fix failing RocksJava test compilation and add CI jobs
+* Fix jemalloc compilation issue on macOS
+* Fix build issues - compatibility with older gcc, older jemalloc libraries, docker warning when building i686 binaries
+
 ## 6.15.1 (12/01/2020)
 ### Bug Fixes
 * Truncated WALs ending in incomplete records can no longer produce gaps in the recovered data when `WALRecoveryMode::kPointInTimeRecovery` is used. Gaps are still possible when WALs are truncated exactly on record boundaries.

diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 7d176f7dc0d5f6ddc41f4b79a6538f3a5cfdd295..0fc493fe42bfe09c15236cb2661b6029a9d53866 100644 (file)
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 6
 #define ROCKSDB_MINOR 15
-#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