natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Aleksey Yeshchenko 2026-03-13 14:58:07 +00:00
parent ddfba19f9e 65ddddf6fb
commit 40d52159f7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -9,6 +9,7 @@
* Adding missing configs in system_views.settings to be backward compatible (CASSANDRA-20863) * Adding missing configs in system_views.settings to be backward compatible (CASSANDRA-20863)
* Heap dump should not be generated on handled exceptions (CASSANDRA-20974) * Heap dump should not be generated on handled exceptions (CASSANDRA-20974)
Merged from 4.1: Merged from 4.1:
* Fix ant generate-eclipse-files (CASSANDRA-21215)
* Disk usage guardrail cannot be disabled when failure threshold is reached (CASSANDRA-21057) * 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) * ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
Merged from 4.0: Merged from 4.0:

2
build.xml
View File

@ -1981,7 +1981,7 @@
</path> </path>
<pathconvert property="eclipse-libs-list" refid="eclipse-project-libs-path" pathsep="${line.separator}"> <pathconvert property="eclipse-libs-list" refid="eclipse-project-libs-path" pathsep="${line.separator}">
<mapper> <mapper>
<regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1\" \/&gt;'/> <regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1" /&gt;'/>
</mapper> </mapper>
</pathconvert> </pathconvert>
<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/> <property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>