Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Brandon Williams 2023-12-06 06:32:19 -06:00
commit 2e3d7e76f5
2 changed files with 10 additions and 0 deletions

View File

@ -100,4 +100,13 @@
<cve>CVE-2022-42004</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>

View File

@ -3,6 +3,7 @@
* Revert CASSANDRA-18543 (CASSANDRA-18854)
* Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739)
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)
* Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935)