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 617fd3b935a0dc869c4c33995a3be78e07bf638a
Merge: e27ee64f7f 45afe53827
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Wed Oct 7 16:00:06 2026 +0100

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |  1 +
 .../org/apache/cassandra/tcm/ClusterMetadata.java  |  3 +
 .../cassandra/tcm/sequences/ReconfigureCMS.java    |  6 +-
 .../tcm/transformations/PrepareLeave.java          |  6 ++
 .../ConcurrentCMSReconfigurationAndMoveTest.java   | 66 ++++++++++++++++
 ...CMSReconfigurationAndNodeOperationTestBase.java | 91 ++++++++++++++++++++++
 ...igurationAndReplacementOfJoiningMemberTest.java | 71 +++++++++++++++++
 ...igurationAndReplacementOfLeavingMemberTest.java | 83 ++++++++++++++++++++
 .../distributed/test/log/TestProcessor.java        | 24 +++++-
 .../tcm/transformations/PrepareLeaveTest.java      | 56 +++++++++++++
 10 files changed, 403 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 23777fae0d,4413bd5fc9..44885cd1a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -6.0-alpha3
 +7.0
 + * Extract reusable HttpService from cloud metadata connector 
(CASSANDRA-21195)
 + * Redact hash and _hash suffixed parameters in system_views.settings 
(CASSANDRA-21686)
 + * Allow CQLSSTableWriter to specify SSTable id generator to use 
(CASSANDRA-21012)
 + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or 
end (CASSANDRA-21068)
 + * Support pluggable default role initialization (CASSANDRA-21546)
 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366)
 + * Don't increment client metrics on messaging service connection unpause 
(CASSANDRA-21491)
 + * Add nodetool getreplicas (CASSANDRA-17665)
 + * 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:
+  * Block decommission if node is a participant in a CMS reconfiguration 
(CASSANDRA-21591)
   * Sharding support for non-vector SAI in-memory indexes (CASSANDRA-18216)
   * Index hints serialization rejects a count that the validation accepts 
(CASSANDRA-21700)
   * Do not expose system_metrics virtual keyspace by default (CASSANDRA-21720)


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

Reply via email to