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

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

commit 358c9ae109a9b952808263b7846e1b2393acfdb8
Merge: 76930541c1 6d56de7b1d
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Tue Sep 15 17:31:52 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |  1 +
 .../org/apache/cassandra/tcm/CMSOperations.java    | 16 +++-
 .../apache/cassandra/tcm/CMSOperationsMBean.java   |  2 +
 .../cassandra/tcm/ClusterMetadataService.java      | 73 +++++++++++++++++-
 .../cms/PrepareCMSReconfiguration.java             | 10 ++-
 .../apache/cassandra/tools/nodetool/CMSAdmin.java  | 16 +++-
 .../distributed/test/log/ReconfigureCMSTest.java   | 88 ++++++++++++++++++++++
 test/resources/nodetool/help/cms                   | 11 ++-
 test/resources/nodetool/help/cms$reconfigure       | 12 ++-
 9 files changed, 216 insertions(+), 13 deletions(-)

diff --cc CHANGES.txt
index 160f877621,b2f6e5892f..d0f0322d4f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -6.0-alpha3
 +7.0
 + * 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:
+  * Allow nodetool cms reconfigure to ignore nodes via --ignore, excluding 
them from the new CMS (CASSANDRA-21627)
   * Accord: Compute Dependencies Incrementally (CASSANDRA-21682)
   * Avoid double chunk read for BTI small partitions during a select query 
execution (CASSANDRA-21637)
   * Report the number of rows replica filtering protection cached when it 
warns (CASSANDRA-21623)


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

Reply via email to