Update version and HISTORY for 9.6.1

diff --git a/HISTORY.md b/HISTORY.md
index f3ad192da6816e76324f88b60dcab0b817a1b8ec..aed182fac997082ac42b3e43af3885911ad40017 100644 (file)
--- 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`
 
+## 9.6.1 (08/24/2024)
+### Bug Fixes
+* Fix correctness of MultiGet across column families with user timestamp.
+
 ## 9.6.0 (08/19/2024)
 ### New Features
 * *Best efforts recovery supports recovering to incomplete Version with a clean seqno cut that presents a valid point in time view from the user's perspective, if versioning history doesn't include atomic flush.

diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index f1bc9f987e82811f1cbb485d37cacd2dc24f6c5d..6e0c73702edfa727e047658423e481596edcfb01 100644 (file)
--- 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 6
-#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