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

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Stefan Miklosovic 2022-10-21 10:05:47 +02:00
parent ce1584ccc8 761d9f9516
commit 8429229b7d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.build/build-rat.xml
View File

@ -35,6 +35,9 @@
<equals arg1="${git.success}" arg2="0"/>
</not>
</condition>
</target>
<target name="_rat_copy_versioned_files" depends="_build_ratinclude" unless="${rat.skip}">
<copy file="build/.versioned_files" tofile="build/.ratinclude">
<filterchain>
<linecontainsregexp>
@ -44,7 +47,7 @@
</copy>
</target>
<target name="rat-check" depends="_build_ratinclude" unless="${rat.skip}" description="License checks on source" >
<target name="rat-check" depends="_rat_copy_versioned_files" unless="${rat.skip}" description="License checks on source" >
<rat:report reportFile="${build.dir}/rat.txt">
<fileset dir="." includesfile="build/.ratinclude">
<!-- Config files with not much creativity -->

1
CHANGES.txt
View File

@ -15,6 +15,7 @@ Merged from 3.11:
* Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
* Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840)
Merged from 3.0:
* Fix running Ant rat targets without git (CASSANDRA-17974)
* Harden JMX by resolving beanshooter issues (CASSANDRA-17921)
* Suppress CVE-2019-2684 (CASSANDRA-17965)
* Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879)