From: Peter Dillinger <peterd@meta.com>
Date: Sat, 24 Aug 2024 15:41:51 +0000 (-0700)
Subject: Update version and HISTORY for 9.6.1
X-Git-Tag: v9.6.1~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca3418ca3d4f4e0bea27bf0dde8a7abc3474183b;p=rocksdb.git

Update version and HISTORY for 9.6.1
---

diff --git a/HISTORY.md b/HISTORY.md
index f3ad192da..aed182fac 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`
 
+## 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 f1bc9f987..6e0c73702 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 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