Skip to content

Commit 40d5215

Browse files
committed
Merge branch 'cassandra-4.1' into cassandra-5.0
2 parents ddfba19 + 65ddddf commit 40d5215

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Adding missing configs in system_views.settings to be backward compatible (CASSANDRA-20863)
1010
* Heap dump should not be generated on handled exceptions (CASSANDRA-20974)
1111
Merged from 4.1:
12+
* Fix ant generate-eclipse-files (CASSANDRA-21215)
1213
* Disk usage guardrail cannot be disabled when failure threshold is reached (CASSANDRA-21057)
1314
* ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
1415
Merged from 4.0:

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@
19811981
</path>
19821982
<pathconvert property="eclipse-libs-list" refid="eclipse-project-libs-path" pathsep="${line.separator}">
19831983
<mapper>
1984-
<regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1\" \/&gt;'/>
1984+
<regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1" /&gt;'/>
19851985
</mapper>
19861986
</pathconvert>
19871987
<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>

0 commit comments

Comments
 (0)