This is an automated email from the ASF dual-hosted git repository. belliottsmith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ec2c276be145bb25085c5c35ac0da69113b676ff Merge: 0e2f6d3608 c7f551a5d4 Author: Benedict Elliott Smith <[email protected]> AuthorDate: Sat Oct 10 17:04:26 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + modules/accord | 2 +- .../config/CassandraRelevantProperties.java | 5 +- .../cql3/statements/TransactionStatement.java | 4 +- .../org/apache/cassandra/service/StorageProxy.java | 4 +- .../cassandra/service/accord/AccordService.java | 2 +- .../cassandra/service/accord/txn/TxnUpdate.java | 10 ++-- .../cassandra/service/accord/txn/TxnWrite.java | 50 +++++++++----------- .../migration/ConsensusRequestRouter.java | 5 +- .../distributed/test/accord/AccordCQLTestBase.java | 55 ++++++++++++++++++++++ .../service/accord/txn/TxnUpdateTest.java | 16 +++++-- 11 files changed, 105 insertions(+), 49 deletions(-) diff --cc CHANGES.txt index 3473f50e2c,2572938cf6..6269ace2b3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -6.0-alpha3 +7.0 + * Extract reusable HttpService from cloud metadata connector (CASSANDRA-21195) + * Redact hash and _hash suffixed parameters in system_views.settings (CASSANDRA-21686) + * Allow CQLSSTableWriter to specify SSTable id generator to use (CASSANDRA-21012) + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or end (CASSANDRA-21068) + * Support pluggable default role initialization (CASSANDRA-21546) + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366) + * Don't increment client metrics on messaging service connection unpause (CASSANDRA-21491) + * Add nodetool getreplicas (CASSANDRA-17665) + * 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: + * Accord: Torn Single Partition Reads (CASSANDRA-21741) * Accord: Add support for ELSE/ELSE IF (CASSANDRA-21484) * Accord: Improve Rebootstrap (CASSANDRA-21687) * Block decommission if node is a participant in a CMS reconfiguration (CASSANDRA-21591) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
