natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Brandon Williams 2023-12-06 06:34:26 -06:00
parent c5a2781b22 fdfc5e614d
commit ad86c9d201
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,4 +49,14 @@
<cve>CVE-2022-42004</cve>
<cve>CVE-2023-35116</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-19142 -->
<suppress>
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
<cve>CVE-2023-6378</cve>
</suppress>
<suppress>
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
<cve>CVE-2023-6378</cve>
</suppress>
</suppressions>

1
CHANGES.txt
View File

@ -67,6 +67,7 @@ Merged from 4.0:
Merged from 3.11:
* Revert CASSANDRA-18543 (CASSANDRA-18854)
Merged from 3.0:
* Suppress CVE-2023-6378 (CASSANDRA-19142)
* Do not set RPC_READY to false on transports shutdown in order to not fail counter updates for deployments with coordinator and storage nodes with transports turned off (CASSANDRA-18935)
* Suppress CVE-2023-44487 (CASSANDRA-18943)
* Implement the logic in bin/stop-server (CASSANDRA-18838)