This is an automated email from the ASF dual-hosted git repository.
mikea pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit afa86df27db7be06bc73e9bcb69a3ff295268daa
Merge: 901786ec27 5ec0669bec
Author: Mike Adamson <madam...@datastax.com>
AuthorDate: Wed Dec 13 12:23:53 2023 +0000
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../index/sai/disk/IndexSearchResultIterator.java | 18 +--
.../sai/disk/SSTableRowIdKeyRangeIterator.java | 160 ---------------------
.../disk/v1/postings/PostingListRangeIterator.java | 1 +
.../cassandra/index/sai/plan/QueryController.java | 25 ++--
.../sai/plan/StorageAttachedIndexSearcher.java | 6 +-
.../index/sai/postings/RangePostingList.java | 88 ------------
7 files changed, 14 insertions(+), 285 deletions(-)
diff --cc CHANGES.txt
index 617a414473,5c43c68bf3..3b14a53880
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
-5.0-beta2
+5.1
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
