This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit be797bd8030328ae5abdfc20ec45c29f6136c942 Merge: 64a3fc0d3f 2949c8ed22 Author: David Capwell <[email protected]> AuthorDate: Tue Jun 16 10:43:34 2026 -0700 Merge branch 'cassandra-4.1' into cassandra-5.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 6fd1abe903,c402eb2ea7..9000172bbd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,8 +1,13 @@@ -4.1.12 +5.0.9 + * Fix RequestFailureReason serializer and nits in a few others (CASSANDRA-21437) + * Remove golang dependency in gen-doc and replace with python implementation (CASSANDRA-21432) + * Use estimated compressed size for tables to check if there is enough free space for a compaction (CASSANDRA-21245) + * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348) + * 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 114596ba74,516732747e..793b3d7743 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@@ -75,8 -71,9 +75,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.assertj.core.api.Assertions.assertThat; 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]
