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 43a1f51d45d9ca61190398d684c3828c78d32669
Merge: e28b9bd1f7 7927ac4395
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Wed May 20 16:29:24 2026 +0100

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |  5 +++--
 .../tcm/sequences/UnbootstrapStreams.java          | 18 ++++++++++++++++--
 .../test/HintedHandoffAddRemoveNodesTest.java      | 22 ++++++++++++----------
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --cc CHANGES.txt
index b458312d7c,dce5f7f77f..caa2c73420
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,18 @@@
 +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)
++6.0-alpha2
 + * 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
+  * Restore option to avoid hint transfer during decommission (CASSANDRA-21341)
+  * Add an offline cluster metadata tool (CASSANDRA-19151)
   * 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]

Reply via email to