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

aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b50152af220bf0569f289513e004a879af2e04e8
Merge: 88b373a631 40d52159f7
Author: Aleksey Yeshchenko <[email protected]>
AuthorDate: Fri Mar 13 15:08:19 2026 +0000

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt | 13 +++++++++++++
 build.xml   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 41d379fbde,7a55b29fa1..8c90013fcc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -309,6 -8,22 +309,19 @@@ Merged from 5.0
   * Correctly calculate default for FailureDetector max interval 
(CASSANDRA-21025)
   * Adding missing configs in system_views.settings to be backward compatible 
(CASSANDRA-20863)
   * Heap dump should not be generated on handled exceptions (CASSANDRA-20974)
+ Merged from 4.1:
+  * Fix ant generate-eclipse-files (CASSANDRA-21215)
+  * Disk usage guardrail cannot be disabled when failure threshold is reached 
(CASSANDRA-21057)
+  * ReadCommandController should close fast to avoid deadlock when building 
secondary index (CASSANDRA-19564)
+ Merged from 4.0:
+  * Obsolete expired SSTables before compaction starts (CASSANDRA-19776)
+  * Switch lz4-java to at.yawk.lz4 version due to CVE (CASSANDRA-21052)
+  * Restrict BytesType compatibility to scalar types only (CASSANDRA-20982)
+  * Backport fix to nodetool gcstats output for direct memory (CASSANDRA-21037)
+  * ArrayIndexOutOfBoundsException with repaired data tracking and counters 
(CASSANDRA-20871)
+  * Fix cleanup of old incremental repair sessions in case of owned token 
range changes or a table deleting (CASSANDRA-20877)
+  * Fix memory leak in BufferPoolAllocator when a capacity needs to be 
extended (CASSANDRA-20753)
+  * Updated dtest-api to 0.0.18 and removed JMX-related classes that now live 
in the dtest-api (CASSANDRA-20884)
 -
 -5.0.6
 - * Upgrade logback version to 1.5.18 and slf4j dependencies to 2.0.17 
(CASSANDRA-20429)
   * Fix range queries on early-open BTI files (CASSANDRA-20976)
   * Avoid re-initializing underlying iterator in 
LazilyInitializedUnfilteredRowIterator after closing (CASSANDRA-20972)
   * Flush SAI segment builder when current SSTable writer is switched 
(CASSANDRA-20752)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to