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:
Brandon Williams 2022-05-18 10:10:04 -05:00
parent 27b5a017ea 01ebd9936f
commit 6158dccbcb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,5 +47,6 @@
<cve>CVE-2021-37136</cve>
<cve>CVE-2021-37137</cve>
<cve>CVE-2021-43797</cve>
<cve>CVE-2022-24823</cve>
</suppress>
</suppressions>

3
CHANGES.txt
View File

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