From ca8082762f736a665b75fa1d39468856071bc3a9 Mon Sep 17 00:00:00 2001 From: Ramkumar Vadivelu Date: Tue, 22 Dec 2020 09:43:58 -0800 Subject: [PATCH] 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) --- .circleci/config.yml | 7 +++++++ HISTORY.md | 6 ++++++ include/rocksdb/version.h | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e42e1d34c..b57ce42be 100644 --- 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 7bec0e440..ac9b95b65 100644 --- 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 7d176f7dc..0fc493fe4 100644 --- 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