This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit aee3c7531bfda5ec88cdc32318008d872aacb802
Merge: 4f382d93f5 985e121404
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Thu Mar 6 11:09:50 2025 -0600
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
Support null column value tombstones in FQL batch statements
CHANGES.txt | 1 +
.../org/apache/cassandra/fql/FullQueryLogger.java | 4 +-
.../test/{ => fql}/FqlReplayDDLExclusionTest.java | 3 +-
.../test/fql/FqlTombstoneHandlingTest.java | 115 +++++++++++++++++++++
.../apache/cassandra/fqltool/FQLQueryReader.java | 5 +-
.../apache/cassandra/fqltool/commands/Dump.java | 9 +-
6 files changed, 129 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index 024b9950ab,6f4716524d..46d57bf4a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,6 -2,6 +15,7 @@@ Merged from 4.1
* Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)
* Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking
thread is interrupted (CASSANDRA-20084)
Merged from 4.0:
++ * Support null column value tombstones in FQL batch statements
(CASSANDRA-20397)
* Fix autocompletion for role names/user names (CASSANDRA-20175)
* Update Zstd library to 1.5.7-1 (CASSANDRA-20367)
* Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
