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 cassandra-5.0

This commit is contained in:
Brandon Williams 2023-12-06 06:33:36 -06:00
parent fe7997884d 13e5956285
commit fdfc5e614d
2 changed files with 15 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>

5
CHANGES.txt
View File

@ -66,6 +66,11 @@ Merged from 4.0:
* Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
Merged from 3.11:
Merged from 3.0:
<<<<<<< HEAD
=======
* 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)
>>>>>>> cassandra-4.1
* Suppress CVE-2023-44487 (CASSANDRA-18943)
* Implement the logic in bin/stop-server (CASSANDRA-18838)
* Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935)