diff --git a/CHANGES.txt b/CHANGES.txt index 41d379fbde..8c90013fcc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -309,6 +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) * 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) diff --git a/build.xml b/build.xml index 0b6dbf54ca..2d060fb9da 100644 --- a/build.xml +++ b/build.xml @@ -2190,7 +2190,7 @@ - +