This is an automated email from the ASF dual-hosted git repository. ycai pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from cbc127ab79 Merge branch 'cassandra-4.1' into trunk add 84e10d0cad Fix race condition on updating cdc size and advancing to next segment add 590de42a06 Merge branch 'cassandra-4.0' into cassandra-4.1 new 0bf9955abf Merge branch 'cassandra-4.1' 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/config/DatabaseDescriptor.java | 8 +-- .../cassandra/db/commitlog/CommitLogSegment.java | 8 ++- .../db/commitlog/CommitLogSegmentManagerCDC.java | 69 ++++++++++++---------- .../commitlog/CommitLogSegmentManagerStandard.java | 3 +- .../commitlog/CommitLogSegmentManagerCDCTest.java | 8 +-- 6 files changed, 55 insertions(+), 42 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org