This is an automated email from the ASF dual-hosted git repository. Mmuzaf pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6e72f6c1abfe4fd85bed425766cde35648e63eac Merge: 7ac557c369 7899b594b8 Author: Maxim Muzafarov <[email protected]> AuthorDate: Thu Jun 18 12:10:22 2026 +0200 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Speed up nodetool doc generation by producing all command help in a single jvm CHANGES.txt | 1 + build.xml | 24 ++++- doc/scripts/gen-nodetool-docs.py | 78 ++++---------- .../tools/nodetool/NodetoolHelpGenerator.java | 113 +++++++++++++++------ 4 files changed, 125 insertions(+), 91 deletions(-) diff --cc CHANGES.txt index 3f1ab2cebe,82abc8fa58..cc92b39a05 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -6.0-alpha2 +7.0 + * 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: + * 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) * Fix ReadCommand serializedSize() using incorrect epoch (CASSANDRA-21438) * Allocation improvements in ProtocolVersion, StorageProxy and MerkleTree (CASSANDRA-21199) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
