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.0' into trunk

This commit is contained in:
Brandon Williams 2022-03-22 07:42:08 -05:00
parent 94c2ad5304 592cee3064
commit 305cb940c3
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

@ -26,6 +26,7 @@
<cve>CVE-2018-8016</cve> <cve>CVE-2018-8016</cve>
<cve>CVE-2020-13946</cve> <cve>CVE-2020-13946</cve>
<cve>CVE-2020-17516</cve> <cve>CVE-2020-17516</cve>
<cve>CVE-2021-44521</cve>
</suppress> </suppress>
<suppress> <suppress>
<!-- dependency checker identified this as a completely different package (wire) --> <!-- dependency checker identified this as a completely different package (wire) -->

1
CHANGES.txt
View File

@ -110,6 +110,7 @@
* GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
* Update JNA library to 5.9.0 and snappy-java to version 1.1.8.4 (CASSANDRA-17040) * Update JNA library to 5.9.0 and snappy-java to version 1.1.8.4 (CASSANDRA-17040)
Merged from 4.0: Merged from 4.0:
* Suppress CVE-2021-44521 from driver (CASSANDRA-17459)
* Upgrade jackson to 2.13.2 (CASSANDRA-17460) * Upgrade jackson to 2.13.2 (CASSANDRA-17460)
* Make sstableloader honour native port option (CASSANDRA-17210) * Make sstableloader honour native port option (CASSANDRA-17210)
* Reject snapshot names with special character (CASSANDRA-15297) * Reject snapshot names with special character (CASSANDRA-15297)