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-06-28 06:04:49 -05:00
parent 04fd3747cf 293f14cf36
commit 0621658acd
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,11 +90,7 @@
<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
<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>
<cve>CVE-2023-35116</cve>
</suppress>
</suppressions>

1
CHANGES.txt
View File

@ -9,6 +9,7 @@ Merged from 3.11:
* Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818
* Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346)
Merged from 3.0:
* Suppress CVE-2023-35116 (CASSANDRA-18630)
* Pass taskId from CompactionTask to system.compaction_history (CASSANDRA-12183)
* Backport CASSANDRA-10508: Remove hard-coded SSL cipher suites (CASSANDRA-18575)
* Suppress CVE-2023-2976 (CASSANDRA-18562)