Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Brandon Williams 2023-12-08 08:56:37 -06:00
commit 8f759e01d5
2 changed files with 10 additions and 0 deletions

View File

@ -54,9 +54,11 @@
<suppress>
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
<cve>CVE-2023-6378</cve>
<cve>CVE-2023-6481</cve>
</suppress>
<suppress>
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
<cve>CVE-2023-6378</cve>
<cve>CVE-2023-6481</cve>
</suppress>
</suppressions>

View File

@ -6,6 +6,14 @@
* Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
* Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
Merged from 5.0:
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
* Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166)
Merged from 4.0:
Merged from 3.11:
Merged from 3.0:
5.0-beta1
* Fix SAI intersection queries (CASSANDRA-19011)
* Clone EndpointState before sending GossipShutdown message (CASSANDRA-19115)
* SAI indexes are marked queryable during truncation (CASSANDRA-19032)