Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Brandon Williams 2022-09-21 05:48:48 -05:00
commit 756fb41512
2 changed files with 10 additions and 0 deletions

View File

@ -28,6 +28,15 @@
<cve>CVE-2020-17516</cve>
<cve>CVE-2021-44521</cve>
</suppress>
<suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-17907 -->
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
<cve>CVE-2022-25857</cve>
<cve>CVE-2022-38749</cve>
<cve>CVE-2022-38750</cve>
<cve>CVE-2022-38751</cve>
<cve>CVE-2022-38752</cve>
</suppress>
<suppress>
<!-- dependency checker identified this as a completely different package (wire) -->
<packageUrl regex="true">^pkg:maven/net\.openhft/chronicle\-wire@.*$</packageUrl>

View File

@ -6,6 +6,7 @@
* Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613)
* Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834)
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 scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862)