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/07/01 13:43:03 UTC
(cassandra) 01/01: Merge branch 'cassandra-6.0' into trunk
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 807cb652fbd722609de8ad7e32d61d866d04f6db
Merge: 2b3258fe86 b1f30e94f5
Author: Sam Tunnicliffe <sa...@apache.org>
AuthorDate: Wed Jul 1 14:39:03 2026 +0100
Merge branch 'cassandra-6.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/Config.java | 45 ++++
.../cassandra/config/DatabaseDescriptor.java | 92 ++++++++
src/java/org/apache/cassandra/net/Verb.java | 1 +
.../apache/cassandra/service/RetryStrategy.java | 2 +
.../apache/cassandra/service/StorageService.java | 13 --
.../cassandra/service/StorageServiceMBean.java | 12 -
.../cassandra/tcm/AbstractLocalProcessor.java | 44 +++-
.../org/apache/cassandra/tcm/CMSOperations.java | 62 ++++++
.../apache/cassandra/tcm/CMSOperationsMBean.java | 26 ++-
.../org/apache/cassandra/tcm/ClusterMetadata.java | 13 ++
.../cassandra/tcm/ClusterMetadataService.java | 66 +++++-
src/java/org/apache/cassandra/tcm/Commit.java | 27 ++-
.../apache/cassandra/tcm/PaxosBackedProcessor.java | 9 +
src/java/org/apache/cassandra/tcm/Processor.java | 40 ----
.../org/apache/cassandra/tcm/RemoteProcessor.java | 22 +-
src/java/org/apache/cassandra/tcm/Retry.java | 23 ++
.../cassandra/tcm/sequences/BootstrapAndJoin.java | 4 +-
.../tcm/sequences/BootstrapAndReplace.java | 4 +-
.../org/apache/cassandra/tcm/sequences/Move.java | 3 +
.../tcm/sequences/UnbootstrapAndLeave.java | 4 +-
.../log/InProgressSequenceCoordinationTest.java | 7 +-
.../test/repair/AutoRepairSchedulerTest.java | 5 +-
.../distributed/test/tcm/LostCommitReqResTest.java | 33 ++-
.../RemoteCmsCommitTimeoutDifferentiationTest.java | 240 ++++++++++++++++++++
.../cassandra/tcm/CommitTimeoutPathsTest.java | 242 +++++++++++++++++++++
test/unit/org/apache/cassandra/tcm/RetryTest.java | 111 ++++++++--
27 files changed, 1031 insertions(+), 120 deletions(-)
diff --cc CHANGES.txt
index 1c19d54134,c9b14d569d..ba9da7bdb1
--- 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:
+ * Move long running TCM operations to a longer timout (CASSANDRA-21453)
* Offline nodetool commands should not print network options in help (CASSANDRA-20876)
* Defer creation of the system_cluster_metadata keyspace until CMS initialization (CASSANDRA-21477)
* Support direct I/O for background SSTable writes (CASSANDRA-21134)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org