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 4ea936b2c7c14cf4757d32fb870a50794b7b365b Merge: 9fdc212b4b 9a896cbaeb Author: Sam Tunnicliffe <[email protected]> AuthorDate: Fri Jun 19 16:11:57 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 2 + src/java/org/apache/cassandra/config/Config.java | 28 +++- .../cassandra/config/DatabaseDescriptor.java | 16 ++ .../apache/cassandra/service/StorageService.java | 13 ++ .../cassandra/service/StorageServiceMBean.java | 12 ++ .../org/apache/cassandra/tcm/RemoteProcessor.java | 74 ++++++++- .../org/apache/cassandra/tcm/log/LogReader.java | 11 +- .../test/log/CatchupViaSnapshotTest.java | 87 +++++++++++ .../config/DatabaseDescriptorRefTest.java | 1 + .../apache/cassandra/tcm/RemoteProcessorTest.java | 166 +++++++++++++++++++++ .../tcm/log/LocalStorageLogStateTest.java | 48 ++++++ 11 files changed, 455 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 74bf8d006f,c2d495450a..eb9d884f88 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,10 @@@ -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: ++ * Add policy for selecting CMS host when submitting commit request (CASSANDRA-21456) + * Fix TCM log catchup from peer with snapshots and gaps in the log sequence (CASSANDRA-21455) * Speed up nodetool doc generation by producing all command help in a single jvm (CASSANDRA-21444) * Always send TCM commit failures as Messaging failures (CASSANDRA-21457) * Fix ReadCommand serializedSize() using incorrect epoch (CASSANDRA-21438) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
