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.1' into trunk

This commit is contained in:
Brandon Williams 2023-06-05 05:59:24 -05:00
parent c32a848008 6b99db84ba
commit 60200ba613
2 changed files with 3 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

@ -53,6 +53,7 @@
<!-- not applicable https://nvd.nist.gov/vuln/detail/CVE-2020-8908 -->
<packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
<cve>CVE-2020-8908</cve>
<cve>CVE-2023-2976</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-18146 -->
<suppress>

2
CHANGES.txt
View File

@ -151,6 +151,8 @@ Merged from 4.0:
* Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
Merged from 3.11:
Merged from 3.0:
3.0.30
* Suppress CVE-2023-2976 (CASSANDRA-18562)
* Remove dh_python use in Debian packaging (CASSANDRA-18558)