You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by fr...@apache.org on 2026/09/09 00:10:56 UTC

(cassandra) branch trunk updated (4203dbe173 -> 88fd0f6a0e)

This is an automated email from the ASF dual-hosted git repository.

frankgh pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 4203dbe173 Merge branch 'cassandra-6.0' into trunk
     add e87f4559a9 Fixes for fully-expired SSTable index notification in compaction
     add d035ff148f Merge branch 'cassandra-4.0' into cassandra-4.1
     add 471654bcf8 Merge branch 'cassandra-4.1' into cassandra-5.0
     add eedd37333f Merge branch 'cassandra-5.0' into cassandra-6.0
     new 88fd0f6a0e Merge branch 'cassandra-6.0' into trunk

The 1 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 +
 .../cassandra/db/compaction/CompactionTask.java    |  38 +++++--
 .../apache/cassandra/index/accord/NoOpIndex.java   |   6 +
 .../cassandra/index/accord/RouteJournalIndex.java  |   6 +
 .../paxos/uncommitted/PaxosUncommittedIndex.java   |   6 +
 .../apache/cassandra/index/CustomIndexTest.java    | 126 +++++++++++++++++++--
 6 files changed, 167 insertions(+), 16 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 fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

frankgh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 88fd0f6a0eaed8943f05ac9e8f947882b8ddc8f1
Merge: 4203dbe173 eedd37333f
Author: Francisco Guerrero <fr...@apache.org>
AuthorDate: Tue Sep 8 17:07:09 2026 -0700

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Fixes for fully-expired SSTable index notification in compaction

 CHANGES.txt                                        |   1 +
 .../cassandra/db/compaction/CompactionTask.java    |  38 +++++--
 .../apache/cassandra/index/accord/NoOpIndex.java   |   6 +
 .../cassandra/index/accord/RouteJournalIndex.java  |   6 +
 .../paxos/uncommitted/PaxosUncommittedIndex.java   |   6 +
 .../apache/cassandra/index/CustomIndexTest.java    | 126 +++++++++++++++++++--
 6 files changed, 167 insertions(+), 16 deletions(-)



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