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-01-23 06:57:18 -06:00
parent cab864a631 b9b18aa5a2
commit 6226ec277b
2 changed files with 2 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

@ -76,6 +76,7 @@
<cve>CVE-2021-37137</cve>
<cve>CVE-2021-43797</cve>
<cve>CVE-2022-24823</cve>
<cve>CVE-2022-41881</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-17966 -->
<suppress>

1
CHANGES.txt
View File

@ -110,6 +110,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-2022-41881 (CASSANDRA-18148)
* Default role is created with zero timestamp (CASSANDRA-12525)
* Suppress CVE-2021-37533 (CASSANDRA-18146)
* Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126)