diff --git a/HISTORY.md b/HISTORY.md index 0a2169e00e..f6ab802b44 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,10 @@ # Rocksdb Change Log > NOTE: Entries for next release do not go here. Follow instructions in `unreleased_history/README.txt` +## 8.11.99 (02/21/2024) +### Behavior Changes +* Merge writes will only keep merge operand count within `ColumnFamilyOptions::max_successive_merges` when the key's merge operands are all found in memory, unless `strict_max_successive_merges` is explicitly set. + ## 8.11.2 (02/16/2024) * Update zlib to 1.3.1 for Java builds diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h index 7a5e395f7d..1a38140d28 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 8 #define ROCKSDB_MINOR 11 -#define ROCKSDB_PATCH 2 +#define ROCKSDB_PATCH 99 // 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/behavior_changes/max_successive_merges_io.md b/unreleased_history/behavior_changes/max_successive_merges_io.md deleted file mode 100644 index c331b40497..0000000000 --- a/unreleased_history/behavior_changes/max_successive_merges_io.md +++ /dev/null @@ -1 +0,0 @@ -* Merge writes will only keep merge operand count within `ColumnFamilyOptions::max_successive_merges` when the key's merge operands are all found in memory, unless `strict_max_successive_merges` is explicitly set.