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

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Brandon Williams 2023-04-03 05:58:42 -05:00
parent 853ae8c840 f9364e4f44
commit ed904a72f4
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,5 +89,10 @@
<cve>CVE-2022-42003</cve>
<cve>CVE-2022-42004</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-18389 -->
<suppress>
<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core.*$</packageUrl>
<cve>CVE-2022-45688</cve>
</suppress>
</suppressions>

1
CHANGES.txt
View File

@ -5,6 +5,7 @@
* Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
* Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
Merged from 3.11:
* Suppress CVE-2022-45688 (CASSANDRA-18389)
Merged from 3.0:
* Save host id to system.local and flush immediately after startup (CASSANDRA-18153)
* Fix the ordering of sstables when running sstableupgrade tool (CASSANDRA-18143)