summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY.md5
-rw-r--r--include/rocksdb/version.h2
-rw-r--r--unreleased_history/bug_fixes/java_fix_sstfilemetadata.md1
-rw-r--r--unreleased_history/bug_fixes/max_successive_merges_regression.md1
4 files changed, 6 insertions, 3 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 058f326c6..e2eea4da1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,11 @@
# Rocksdb Change Log
> NOTE: Entries for next release do not go here. Follow instructions in `unreleased_history/README.txt`
+## 9.1.1 (04/17/2024)
+### Bug Fixes
+* Fixed Java `SstFileMetaData` to prevent throwing `java.lang.NoSuchMethodError`
+* Fixed a regression when `ColumnFamilyOptions::max_successive_merges > 0` where the CPU overhead for deciding whether to merge could have increased unless the user had set the option `ColumnFamilyOptions::strict_max_successive_merges`
+
## 9.1.0 (03/22/2024)
### New Features
* Added an option, `GetMergeOperandsOptions::continue_cb`, to give users the ability to end `GetMergeOperands()`'s lookup process before all merge operands were found.
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 10603a773..32bae6700 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -13,7 +13,7 @@
// minor or major version number planned for release.
#define ROCKSDB_MAJOR 9
#define ROCKSDB_MINOR 1
-#define ROCKSDB_PATCH 0
+#define ROCKSDB_PATCH 1
// 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
diff --git a/unreleased_history/bug_fixes/java_fix_sstfilemetadata.md b/unreleased_history/bug_fixes/java_fix_sstfilemetadata.md
deleted file mode 100644
index 9a87bb087..000000000
--- a/unreleased_history/bug_fixes/java_fix_sstfilemetadata.md
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed Java `SstFileMetaData` to prevent throwing `java.lang.NoSuchMethodError`
diff --git a/unreleased_history/bug_fixes/max_successive_merges_regression.md b/unreleased_history/bug_fixes/max_successive_merges_regression.md
deleted file mode 100644
index d00028014..000000000
--- a/unreleased_history/bug_fixes/max_successive_merges_regression.md
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed a regression when `ColumnFamilyOptions::max_successive_merges > 0` where the CPU overhead for deciding whether to merge could have increased unless the user had set the option `ColumnFamilyOptions::strict_max_successive_merges`