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 1332e217f94290225aa9723be27a7db10ddccd5e
Merge: 6bee931da9 1df3a8cef0
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Wed Jul 8 15:36:49 2026 +0100

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |   1 +
 .../org/apache/cassandra/tcm/PeerLogFetcher.java   |  37 +--
 .../apache/cassandra/tcm/PeerLogFetcherTest.java   | 354 +++++++++++++++++++++
 3 files changed, 374 insertions(+), 18 deletions(-)

diff --cc CHANGES.txt
index 7aa91ee956,51b576d242..0ecb0bb11e
--- 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:
+  * Avoid potential deadlock between GlobalLogFollower and GossipStage 
(CASSANDRA-21384)
   * Add CMS membership as a field in ClusterMetadata (CASSANDRA-20736)
   * Fix maven remote publishing of Accord artifacts (CASSANDRA-21261)
   * Move long running TCM operations to a longer timout (CASSANDRA-21453)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to