You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2025/11/07 19:54:49 UTC

(cassandra) 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit e4ea61c1cc836aee61e8df2513383660b239e280
Merge: 7b312d4329 61014f2ae7
Author: David Capwell <dc...@apache.org>
AuthorDate: Fri Nov 7 11:44:54 2025 -0800

    Merge branch 'cassandra-4.0' into cassandra-4.1

 CHANGES.txt                                        |  1 +
 .../db/compaction/LeveledCompactionStrategy.java   | 29 +++++++++++++++++++---
 .../compaction/LeveledCompactionStrategyTest.java  | 18 ++++++++++++++
 .../schema/CreateTableValidationTest.java          | 16 +++++++++++-
 4 files changed, 60 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 3bafbd0940,8364602a1a..6b13602e5f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,10 +1,20 @@@
 -4.0.20
 +4.1.11
 + * ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
 + * Redact security-sensitive information in system_views.settings (CASSANDRA-20856)
 +Merged from 4.0:
+  * Leveled Compaction doesn't validate maxBytesForLevel when the table is altered/created (CASSANDRA-20570)
   * Updated dtest-api to 0.0.18 and removed JMX-related classes that now live in the dtest-api (CASSANDRA-20884)
 -
 -4.0.19
   * Fixed incorrect error message constant for keyspace name length validation (CASSANDRA-20915)
   * update shaded cassandra-driver-core to 3.11.5 (CASSANDRA-20904)
 +
 +
 +4.1.10
 + * Improve CommitLogSegmentReader to skip SyncBlocks correctly in case of CRC errors (CASSANDRA-20664)
 + * Do not crash on first boot with data_disk_usage_max_disk_size set when data directory is not created yet (CASSANDRA-20787)
 + * Rework / simplification of nodetool get/setguardrailsconfig commands (CASSANDRA-20778)
 + * IntrusiveStack.accumulate is not accumulating correctly (CASSANDRA-20670)
 + * Add nodetool get/setguardrailsconfig commands (CASSANDRA-19552)
 +Merged from 4.0:
   * Prevent too long table names not fitting file names (CASSANDRA-20389)
   * Fix IndexOutOfBoundsException in sstablemetadata tool when a range tombstone is a max clustering value (CASSANDRA-20855)
   * Update Jackson to 2.19.2 (CASSANDRA-20848)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org