This is an automated email from the ASF dual-hosted git repository. blambov pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 8ffaf4af62 Merge branch 'cassandra-4.1' into trunk new 60b54425ed Fix commitLogUpperBound initialization in AbstractMemtableWithCommitlog so that it is always available when writeBarrier gets initialized. new 4e8c831189 Merge branch 'cassandra-4.1' 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 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../cassandra/db/memtable/AbstractMemtable.java | 5 +- .../db/memtable/AbstractMemtableWithCommitlog.java | 8 ++- .../org/apache/cassandra/db/memtable/Flushing.java | 2 +- .../org/apache/cassandra/db/memtable/Memtable.java | 2 +- .../cassandra/db/commitlog/CommitLogCQLTest.java | 69 ++++++++++++++++++++++ 7 files changed, 80 insertions(+), 9 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org