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

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

commit ee0dcc30ba27ba5dcbe8d587f8723c5e67dacf87
Merge: 5ddc434569 03422edb4b
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Wed Jun 24 14:17:11 2026 +0100

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |   1 +
 .../cassandra/db/SinglePartitionReadCommand.java   |   4 +-
 .../org/apache/cassandra/dht/IPartitioner.java     |   9 ++
 ...ndexTablePartitionerAfterForceSnapshotTest.java | 141 +++++++++++++++++++++
 .../upgrade/ClusterMetadata2iInitializeTest.java   | 112 ++++++++++++++++
 5 files changed, 266 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 73e8de6c7e,eef9e5b576..0e228036b9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,12 @@@
 -6.0-alpha2
 +7.0
 + * Implementation of CEP-49: Hardware-accelerated compression 
(CASSANDRA-20975)
 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394)
 + * Allow nodetool garbagecollect to take a user defined list of SSTables 
(CASSANDRA-16767)
 + * Add a guardrail for misprepared statements (CASSANDRA-21139)
 +Merged from 6.0:
+  * Relax assertion on partitioner instances in SinglePartitionReadCommand 
(CASSANDRA-21251)
   * Report cancelled read command execution to coordinator as a 
RequestFailure.TIMEOUT (CASSANDRA-21468)
 + * Add policy for selecting CMS host when submitting commit request 
(CASSANDRA-21456)
   * Fix TCM log catchup from peer with snapshots and gaps in the log sequence 
(CASSANDRA-21455)
   * Speed up nodetool doc generation by producing all command help in a single 
jvm (CASSANDRA-21444)
   * Always send TCM commit failures as Messaging failures (CASSANDRA-21457)


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

Reply via email to