This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b9240d0004e54c5bfdd2f6b07a251b1d7c080c99
Merge: 2d982a0e52 f2c46cbf3b
Author: Jacek Lewandowski <lewandowski.ja...@gmail.com>
AuthorDate: Tue Oct 31 11:15:46 2023 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Retrieve keyspaces metadata and schema version concistently in
DescribeStatement
CHANGES.txt | 1 +
.../cql3/statements/DescribeStatement.java | 19 +-
src/java/org/apache/cassandra/schema/Schema.java | 18 +-
.../org/apache/cassandra/schema/SchemaEvent.java | 2 +-
.../cql3/statements/DescribeStatementTest.java | 325 +++++++++++----------
.../org/apache/cassandra/schema/SchemaTest.java | 110 +++++++
6 files changed, 301 insertions(+), 174 deletions(-)
diff --cc CHANGES.txt
index 8c1cccac32,8611719d56..3ca783fb97
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -64,25 -60,6 +64,26 @@@ Merged from 3.0
* Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161)
* Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
* Add guardrail for vector dimensions (CASSANDRA-18730)
+Merged from 4.1:
+ * Fixed the inconsistency between distributedKeyspaces and
distributedAndLocalKeyspaces (CASSANDRA-18747)
+ * Waiting indefinitely on ReceivedMessage response in
StreamSession#receive() can cause deadlock (CASSANDRA-18733)
+ * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
+Merged from 4.0:
++ * Retrieve keyspaces metadata and schema version concistently in
DescribeStatement (CASSANDRA-18921)
+ * JMH improvements - faster build and async profiler (CASSANDRA-18871)
+Merged from 3.11:
+ * Fix NPE when using udfContext in UDF after a restart of a node
(CASSANDRA-18739)
+Merged from 3.0:
+ * Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
+ * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
+ * Make alternation of a user type validate the same way as creation of a
user type does (CASSANDRA-18585)
+ * Fix missing speculative retries in tablestats (CASSANDRA-18767)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
+
+
+5.0
* Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992)
* Fix for (unsupported) big endian unaligned architecture, eg s390x
(CASSANDRA-17723)
* CIDR filtering authorizer (CASSANDRA-18592)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
