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.0' into cassandra-3.11

This commit is contained in:
Brandon Williams 2022-05-18 10:09:32 -05:00
parent 9810922cf1 a482e37435
commit 01ebd9936f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.build/dependency-check-suppressions.xml
View File

@ -38,6 +38,7 @@
<cve>CVE-2021-37136</cve> <cve>CVE-2021-37136</cve>
<cve>CVE-2021-37137</cve> <cve>CVE-2021-37137</cve>
<cve>CVE-2021-43797</cve> <cve>CVE-2021-43797</cve>
<cve>CVE-2022-24823</cve>
</suppress> </suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-14183 --> <!-- https://issues.apache.org/jira/browse/CASSANDRA-14183 -->

1
CHANGES.txt
View File

@ -1,5 +1,6 @@
3.11.14 3.11.14
Merged from 3.0: Merged from 3.0:
* Suppress CVE-2022-24823 (CASSANDRA-17633)
* fsync TOC and digest files (CASSANDRA-10709) * fsync TOC and digest files (CASSANDRA-10709)