This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch cassandra-6.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6c44f0561b496711b7a8535771a0cdee4fc55191 Merge: ef6367ed10 be797bd803 Author: David Capwell <[email protected]> AuthorDate: Tue Jun 16 10:44:39 2026 -0700 Merge branch 'cassandra-5.0' into cassandra-6.0 CHANGES.txt | 1 + .../db/compaction/LeveledCompactionStrategy.java | 5 ++-- .../compaction/LeveledCompactionStrategyTest.java | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index a9850a4a9e,9000172bbd..0942f1212b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -56,8 -6,8 +56,9 @@@ Merged from 5.0 * Ensure SAI sends range tombstones to the coordinator for queries on static columns (CASSANDRA-21332) Merged from 4.1: * 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 954bc312c1,793b3d7743..0aeab98f79 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@@ -74,8 -72,10 +74,9 @@@ import org.apache.cassandra.utils.Clock import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.TimeUUID; -import org.awaitility.Awaitility; import static java.util.Collections.singleton; + import static org.apache.cassandra.schema.MockSchema.readerBounds; import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
