This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2949c8ed22ef1c8503834dc54711bfa72021df31 Merge: 1a463d753f 41fd7c3e22 Author: David Capwell <[email protected]> AuthorDate: Tue Jun 16 10:38:42 2026 -0700 Merge branch 'cassandra-4.0' into cassandra-4.1 CHANGES.txt | 1 + .../db/compaction/LeveledCompactionStrategy.java | 5 ++-- .../compaction/LeveledCompactionStrategyTest.java | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 6320d4e5cb,5e6426fbc0..c402eb2ea7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -4.0.21 +4.1.12 + * Add Paxos v2 option and informatin in cassandra.yaml (CASSANDRA-21316) + * Harden data resurrection startup check with atomic heartbeat file write with fallback (CASSANDRA-21290) +Merged from 4.0: + * Consider first token of SSTable when calculating SSTable intersection in LeveledScanner (CASSANDRA-21369) * Remove inFlightEcho entry on ECHO_REQ failure (CASSANDRA-21428) * Validate snapshot names (CASSANDRA-21389) * BTree.FastBuilder.reset() fails to clear savedBuffer and savedNextKey, causing ClassCastException and SSTable header corruption during schema disagreement (CASSANDRA-21216, CASSANDRA-21260) diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java index 2c27ebf52a,b72cfe7f9d..516732747e --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@@ -71,8 -70,8 +71,9 @@@ import org.apache.cassandra.utils.TimeU import org.awaitility.Awaitility; import static java.util.Collections.singleton; + import static org.apache.cassandra.schema.MockSchema.readerBounds; import static org.assertj.core.api.Assertions.assertThat; +import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
