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

This commit is contained in:
Brandon Williams 2023-01-24 12:26:51 -06:00
parent 53156c24e1 299ead7534
commit 057edbe92e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,10 @@
<cve>CVE-2022-38751</cve>
<cve>CVE-2022-38752</cve>
<cve>CVE-2022-41854</cve>
<cve>CVE-2021-1471</cve>
<cve>CVE-2021-3064</cve>
<cve>CVE-2021-4235</cve>
<cve>CVE-2017-18640</cve>
</suppress>
<suppress>
<!-- dependency checker identified this as a completely different package (wire) -->

1
CHANGES.txt
View File

@ -12,6 +12,7 @@ Merged from 4.0:
* Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981)
Merged from 3.11:
Merged from 3.0:
* Suppress CVE-2021-1471, CVE-2021-3064, CVE-2021-4235 (CASSANDRA-18149)
* Switch to snakeyaml's SafeConstructor (CASSANDRA-18150)
* Expand build.dir property in rat targets (CASSANDRA-18183)
* Suppress CVE-2022-41881 (CASSANDRA-18148)