You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2026/04/29 18:44:39 UTC

(cassandra) branch trunk updated (7bd041d292 -> cd75b9c6a1)

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 7bd041d292 Merge branch 'cassandra-6.0' into trunk
     new 8fd2443afc Fix single token batch atomicity with Accord/non-Accord batches by using the batch log
     new cd75b9c6a1 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 +
 .../pages/architecture/cql-on-accord.adoc          |  9 ++-
 .../cassandra/cql3/statements/BatchStatement.java  |  7 +-
 .../ConsensusMigrationMutationHelper.java          | 23 ++++++
 .../distributed/test/accord/AccordCQLTestBase.java | 83 ++++++++++++++++++++++
 5 files changed, 117 insertions(+), 6 deletions(-)


---------------------------------------------------------------------
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 dc...@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 cd75b9c6a1554d1580bdb5b3fbd507cae110b45b
Merge: 7bd041d292 8fd2443afc
Author: David Capwell <dc...@apache.org>
AuthorDate: Wed Apr 29 11:39:56 2026 -0700

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |  1 +
 .../pages/architecture/cql-on-accord.adoc          |  9 ++-
 .../cassandra/cql3/statements/BatchStatement.java  |  7 +-
 .../ConsensusMigrationMutationHelper.java          | 23 ++++++
 .../distributed/test/accord/AccordCQLTestBase.java | 83 ++++++++++++++++++++++
 5 files changed, 117 insertions(+), 6 deletions(-)

diff --cc CHANGES.txt
index 306ab16c25,d877e7c0a7..ab74fbc095
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,9 -4,6 +3,10 @@@ Merged from 6.0
   * Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246)
   * Differentiate between legitimate cases where the first entry is the same as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() (CASSANDRA-21255)
   * Introduce minimum_threshold for data resurrection startup check (CASSANDRA-21293)
 +
 +6.0-alpha2
++ * Fix single token batch atomicity with Accord/non-Accord batches by using the batch log (CASSANDRA-20588)
 + * Avoid CompactionOptions parsing for every read by WithoutPurgeableTombstones (CASSANDRA-21294)
   * Synchronously publish changes to local gossip state following metadata updates (CASSANDRA-21239)
   * Change default for cassandra.set_sep_thread_name to false to reduce CPU usage (CASSANDRA-21089)
   * Avoid permission checks for masked columns when the table doesn't have any (CASSANDRA-21299)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org