This is an automated email from the ASF dual-hosted git repository.

maedhroz pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 985e121404f3777e5385073e986b5847e931d468
Merge: 16bca9d343 f375a3914f
Author: Caleb Rackliffe <[email protected]>
AuthorDate: Thu Mar 6 10:59:33 2025 -0600

    Merge branch 'cassandra-4.0' into cassandra-4.1
    
    * cassandra-4.0:
      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 aaef4c319b,30d253d29b..6f4716524d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,14 -4,12 +7,15 @@@ Merged from 4.0
   * Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
  
  
 -4.0.17
 - * Fix autocompletion for role names/user names (CASSANDRA-20175)
 - * Re-apply: Tighten up permission on system keyspaces (CASSANDRA-20090)
 -
 -
 -4.0.16
 +4.1.8
 + * Run audit_logging_options through santiation and validation on startup 
(CASSANDRA-20208)
 + * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
 + * Add nodetool checktokenmetadata command that checks TokenMetadata is 
insync with Gossip endpointState (CASSANDRA-18758)
 + * Backport Java 11 support for Simulator (CASSANDRA-17178/CASSANDRA-19935)
 + * Equality check for Paxos.Electorate should not depend on collection types 
(CASSANDRA-19935)
 + * Fix race condition in DecayingEstimatedHistogramReservoir during rescale 
(CASSANDRA-19365)
 +Merged from 4.0:
++ * Support null column value tombstones in FQL batch statements 
(CASSANDRA-20397)
   * Tighten up permissions in dc authorizers (CASSANDRA-20225)
   * CBUtil serialization of UTF8 does not handle all UTF8 properly 
(CASSANDRA-20234)
   * Make hint expiry use request start time rather than timeout time for TTL 
(CASSANDRA-20014)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to