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 a434c91c56c7d8b0a27002a46d204923c5dff755 Merge: c61bd06a01 9017e18fa1 Author: Marcus Eriksson <[email protected]> AuthorDate: Tue Jun 9 12:52:10 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 +++++-- src/java/org/apache/cassandra/transport/ProtocolVersion.java | 10 +++++----- src/java/org/apache/cassandra/utils/MerkleTree.java | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --cc CHANGES.txt index 2fcbd4ca3d,b03e6d6627..acd40e2b3e --- 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: + * Allocation improvements in ProtocolVersion, StorageProxy and MerkleTree (CASSANDRA-21199) * Don’t leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236) * Make nodetool abortbootstrap more robust (CASSANDRA-21235) * Don't clear prepared statement cache on nodetool cms initialize (CASSANDRA-21234) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
