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 38e0277503fdcc9f595dfea0028c8ade454cd48b Merge: 017276263a 802ce7f8b2 Author: Sam Tunnicliffe <[email protected]> AuthorDate: Wed Jun 17 12:33:24 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/net/Message.java | 6 + src/java/org/apache/cassandra/tcm/Commit.java | 21 ++- .../org/apache/cassandra/tcm/PeerLogFetcher.java | 10 +- .../org/apache/cassandra/tcm/RemoteProcessor.java | 161 ++++++++++++++------- src/java/org/apache/cassandra/tcm/Retry.java | 5 + .../test/log/CommitStartupByNonCMSNodeTest.java | 83 +++++++++++ 7 files changed, 215 insertions(+), 72 deletions(-) diff --cc CHANGES.txt index 30203a0bb0,8ae621f938..3f1ab2cebe --- 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: + * 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) * Don’t leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
