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-17 09:58:59 -06:00
parent c9968a8e95 ac8ddfb321
commit 0ac3c55d65
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,23 @@
<packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
<cve>CVE-2020-8908</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-18146 -->
<suppress>
<packageUrl regex="true">^pkg:maven/org\.apache\.commons.*$</packageUrl>
<cve>CVE-2021-37533</cve>
</suppress>
<suppress>
<packageUrl regex="true">^pkg:maven/commons-io/.*$</packageUrl>
<cve>CVE-2021-37533</cve>
</suppress>
<suppress>
<packageUrl regex="true">^pkg:maven/commons-cli/.*$</packageUrl>
<cve>CVE-2021-37533</cve>
</suppress>
<suppress>
<packageUrl regex="true">^pkg:maven/commons-codec/.*$</packageUrl>
<cve>CVE-2021-37533</cve>
</suppress>
<!-- netty's http stuff is not applicable here -->
<suppress>
<packageUrl regex="true">^pkg:maven/io\.netty/netty\-all@.*$</packageUrl>

1
CHANGES.txt
View File

@ -7,6 +7,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-37533 (CASSANDRA-18146)
* Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126)
* Avoid anticompaction mixing data from two different time windows with TWCS (CASSANDRA-17970)
* Do not spam the logs with MigrationCoordinator not being able to pull schemas (CASSANDRA-18096)