You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mm...@apache.org on 2026/06/18 10:24:53 UTC
(cassandra) branch trunk updated (7ac557c369 -> 6e72f6c1ab)
This is an automated email from the ASF dual-hosted git repository.
Mmuzaf pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 7ac557c369 Merge branch 'cassandra-6.0' into trunk
add 7899b594b8 Speed up nodetool doc generation by producing all command help in a single jvm
new 6e72f6c1ab Merge branch 'cassandra-6.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-6.0' into trunk
Posted by mm...@apache.org.
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 <mm...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org