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 4226cbbec6c2ac92ed8d3834140f8ea3e3260e59
Merge: 77cf2185b6 b265b4658e
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Thu Aug 24 10:14:40 2023 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../cassandra/index/sai/StorageAttachedIndex.java | 11 +++++++-
.../index/sai/analyzer/AbstractAnalyzer.java | 12 ++++++---
.../index/sai/analyzer/NonTokenizingOptions.java | 5 ++++
.../index/sai/cql/StorageAttachedIndexDDLTest.java | 31 ++++++++++++++++++++++
5 files changed, 56 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index cfc0a9aace,68515312fe..a412b7a8d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,12 +1,6 @@@
-5.0-alpha2
+5.1
+Merged from 5.0:
+ * Forbid SAI indexes with analysis options on primary key columns
(CASSANDRA-18782)
-Merged from 4.1:
-Merged from 4.0:
-Merged from 3.11:
-Merged from 3.0:
- * Make alternation of a user type validate the same way as creation of a
user type does (CASSANDRA-18585)
-
-5.0-alpha1
* Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749)
* Reduce size of per-SSTable index components for SAI (CASSANDRA-18673)
* Remove unnecessary Netty dependencies after upgrade to version 4.1.96
(CASSANDRA-18729)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
