This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b6b71c598eef1a01c52cef0e7fa54c6e24d39095
Merge: 90d0857d34 4a62757624
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu May 4 10:22:25 2023 -0500
Merge branch 'cassandra-3.0' into cassandra-3.11
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 4 ++++
2 files changed, 5 insertions(+)
diff --cc .build/dependency-check-suppressions.xml
index 68c97bb777,5a87f57c3f..98efddce73
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@@ -23,13 -23,13 +23,14 @@@
<suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-16150 -->
<packageUrl
regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
+ <cve>CVE-2023-2251</cve>
- <cve>CVE-2022-38752</cve>
- <cve>CVE-2022-38751</cve>
- <cve>CVE-2022-38750</cve>
- <cve>CVE-2022-41854</cve>
+ <cve>CVE-2017-18640</cve>
<cve>CVE-2022-25857</cve>
<cve>CVE-2022-38749</cve>
+ <cve>CVE-2022-38750</cve>
+ <cve>CVE-2022-38751</cve>
+ <cve>CVE-2022-38752</cve>
+ <cve>CVE-2022-41854</cve>
<cve>CVE-2022-1471</cve>
<cve>CVE-2022-3064</cve>
<cve>CVE-2021-4235</cve>
diff --cc CHANGES.txt
index d80d0be71e,371ba6c526..b132527d5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,13 @@@
-3.0.29
++3.11.16
++Merged from 3.0:
+ * Suppress CVE-2023-2251 (CASSANDRA-18497)
++
+3.11.15
+ * Fix the capital P usage in the CQL parser (CASSANDRA-17919)
+ * Fix sstable_count metric missing from tablestats json/yaml output
(CASSANDRA-18448)
+ * Suppress CVE-2022-45688 (CASSANDRA-18389)
+ * Fix Splitter sometimes creating more splits than requested
(CASSANDRA-18013)
+Merged from 3.0:
* Do not remove SSTables when cause of FSReadError is OutOfMemoryError while
using best_effort disk failure policy (CASSANDRA-18336)
* Do not remove truncated_at entry in system.local while dropping an index
(CASSANDRA-18105)
* Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
