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 206485e8205624536680c9f27e273b222582ffa9 Merge: 5634d4e02a c9d60a61e3 Author: Sam Tunnicliffe <[email protected]> AuthorDate: Fri May 15 14:44:33 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/tools/CMSOfflineTool.java | 825 ++++++++ .../apache/cassandra/tools/nodetool/CMSAdmin.java | 57 +- .../test/log/ClusterMetadataDumpTest.java | 58 + test/resources/nodetool/help/cms | 17 + test/resources/nodetool/help/cms$dump | 38 + .../apache/cassandra/tools/CMSOfflineToolTest.java | 1967 ++++++++++++++++++++ .../apache/cassandra/tools/OfflineToolUtils.java | 5 +- tools/bin/{addtocmstool => cmsofflinetool} | 4 +- 9 files changed, 2968 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 1b24ae81c5,5af655765b..b458312d7c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -6.0-alpha2 +7.0 + * 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: + * Add an offline cluster metadata tool (CASSANDRA-19151) + * Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246) + * Differentiate between legitimate cases where the first entry is the same as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() (CASSANDRA-21255) + * Introduce minimum_threshold for data resurrection startup check (CASSANDRA-21293) +Merged from 5.0: + * Use estimated compressed size for tables to check if there is enough free space for a compaction (CASSANDRA-21245) + * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348) + + +6.0-alpha2 * Accord: Tail Latency Improvements (CASSANDRA-21361) * Artificial Latency Injection (CASSANDRA-17024) * Accord: Clean Shutdown/Restart, Rebootstrap, et al (CASSANDRA-21355) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
