This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 06dabb8b3a97ba0d6278d398f4c6dc24d964c8d3
Merge: 1793c3fd36 c26f2a3d69
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Thu Nov 23 11:52:57 2023 +0000
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../cassandra/index/sai/plan/QueryController.java | 4 ++-
.../index/sai/cql/CollectionIndexingTest.java | 40 ++++++++++++++++++----
3 files changed, 38 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 374db56c60,19c16fde48..9f4038ff7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-beta1
+5.1
+ * 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 SAI unindexed contexts not considering CONTAINS KEY (CASSANDRA-19040)
* Ensure that empty SAI column indexes do not fail on validation after
full-SSTable streaming (CASSANDRA-19017)
* SAI in-memory index should check max term size (CASSANDRA-18926)
* Set default disk_access_mode to mmap_index_only (CASSANDRA-19021)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
