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 2b3258fe86e34632298530d3db4f94fc7b6474c5 Merge: 8f8c4ec09e 26d6b4f665 Author: Stefan Miklosovic <[email protected]> AuthorDate: Tue Jun 30 10:29:06 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/tools/nodetool/History.java | 2 +- .../cassandra/tools/nodetool/LocalCommand.java | 34 ++++++++++++++++++++++ .../nodetool/layout/CassandraCliHelpLayout.java | 20 ++++++++++--- test/resources/nodetool/help/history | 21 +------------ .../tools/nodetool/NodetoolClassHierarchyTest.java | 30 +++++++++++++++++++ 6 files changed, 83 insertions(+), 25 deletions(-) diff --cc CHANGES.txt index 6566e81353,f208e0db29..1c19d54134 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -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: + * Offline nodetool commands should not print network options in help (CASSANDRA-20876) * Defer creation of the system_cluster_metadata keyspace until CMS initialization (CASSANDRA-21477) * Support direct I/O for background SSTable writes (CASSANDRA-21134) * Relax assertion on partitioner instances in SinglePartitionReadCommand (CASSANDRA-21251) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
