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 9e51f6701e623efe08ca75c4a50220c66b1b6f2e
Merge: ffc0f01b0e 2521b83c92
Author: Jacek Lewandowski <lewandowski.ja...@gmail.com>
AuthorDate: Fri Aug 30 10:41:42 2024 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Fix rendering UNSET collection types in query tracing
CHANGES.txt | 1 +
.../transport/messages/ExecuteMessage.java | 5 +++-
.../org/apache/cassandra/cql3/TraceCqlTest.java | 29 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 26cb5d2c29,bdecf8f324..c4bde7339e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -128,12 -71,10 +128,13 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
++ * Fix rendering UNSET collection types in query tracing (CASSANDRA-19880)
+ * Fix latency reported by ideal consistency level monitoring
(CASSANDRA-19651)
+ * Use default commitlog settings in test YAMLs (CASSANDRA-19830)
+ * Do not spam log with SSLExceptions (CASSANDRA-18839)
* Fix schema.cql created by a snapshot after dropping more than one column
(CASSANDRA-19747)
* UnsupportedOperationException when reducing scope for LCS compactions
(CASSANDRA-19704)
* Make LWT conditions behavior on frozen and non-frozen columns consistent
for null column values (CASSANDRA-19637)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
