Merge branch 'cassandra-4.1' into trunk

This commit is contained in:
Brandon Williams 2023-01-30 07:26:44 -06:00
commit 1f58f48e6e
2 changed files with 2 additions and 0 deletions

View File

@ -81,6 +81,7 @@
<cve>CVE-2021-43797</cve>
<cve>CVE-2022-24823</cve>
<cve>CVE-2022-41881</cve>
<cve>CVE-2022-41915</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-17966 -->
<suppress>

View File

@ -116,6 +116,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-2022-41915 (CASSANDRA-18147)
* Introduce check for names of test classes (CASSANDRA-17964)
* Suppress CVE-2021-1471, CVE-2021-3064, CVE-2021-4235 (CASSANDRA-18149)
* Switch to snakeyaml's SafeConstructor (CASSANDRA-18150)