You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2026/06/17 11:37:59 UTC
(cassandra) branch trunk updated (017276263a -> 38e0277503)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 017276263a Merge branch 'cassandra-6.0' into trunk
new 802ce7f8b2 Always send TCM commit failures as Messaging failures
new 38e0277503 Merge branch 'cassandra-6.0' into trunk
The 2 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 +
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(-)
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/log/CommitStartupByNonCMSNodeTest.java
---------------------------------------------------------------------
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 sa...@apache.org.
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 <sa...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org