Skip to content

Commit b50152a

Browse files
committed
Merge branch 'cassandra-5.0' into trunk
2 parents 88b373a + 40d5215 commit b50152a

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

CHANGES.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,19 @@ Merged from 5.0:
309309
* Correctly calculate default for FailureDetector max interval (CASSANDRA-21025)
310310
* Adding missing configs in system_views.settings to be backward compatible (CASSANDRA-20863)
311311
* Heap dump should not be generated on handled exceptions (CASSANDRA-20974)
312+
Merged from 4.1:
313+
* Fix ant generate-eclipse-files (CASSANDRA-21215)
314+
* Disk usage guardrail cannot be disabled when failure threshold is reached (CASSANDRA-21057)
315+
* ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
316+
Merged from 4.0:
317+
* Obsolete expired SSTables before compaction starts (CASSANDRA-19776)
318+
* Switch lz4-java to at.yawk.lz4 version due to CVE (CASSANDRA-21052)
319+
* Restrict BytesType compatibility to scalar types only (CASSANDRA-20982)
320+
* Backport fix to nodetool gcstats output for direct memory (CASSANDRA-21037)
321+
* ArrayIndexOutOfBoundsException with repaired data tracking and counters (CASSANDRA-20871)
322+
* Fix cleanup of old incremental repair sessions in case of owned token range changes or a table deleting (CASSANDRA-20877)
323+
* Fix memory leak in BufferPoolAllocator when a capacity needs to be extended (CASSANDRA-20753)
324+
* Updated dtest-api to 0.0.18 and removed JMX-related classes that now live in the dtest-api (CASSANDRA-20884)
312325
* Fix range queries on early-open BTI files (CASSANDRA-20976)
313326
* Avoid re-initializing underlying iterator in LazilyInitializedUnfilteredRowIterator after closing (CASSANDRA-20972)
314327
* Flush SAI segment builder when current SSTable writer is switched (CASSANDRA-20752)

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2190,7 +2190,7 @@
21902190
</path>
21912191
<pathconvert property="eclipse-libs-list" refid="eclipse-project-libs-path" pathsep="${line.separator}">
21922192
<mapper>
2193-
<regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1\" \/&gt;'/>
2193+
<regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1" /&gt;'/>
21942194
</mapper>
21952195
</pathconvert>
21962196
<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>

0 commit comments

Comments
 (0)