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 6f719f811acec652178ec7c660640e4fc3bd798b
Merge: fc3ad6525f fe71dfd7a1
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Jan 23 06:53:53 2023 -0600
Merge branch 'cassandra-3.0' into 'cassandra-3.11'
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 1 +
2 files changed, 2 insertions(+)
diff --cc CHANGES.txt
index fbf0404ebd,7da1d4281f..314734a50e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.29
+3.11.15
+ * Fix Splitter sometimes creating more splits than requested
(CASSANDRA-18013)
+Merged from 3.0:
+ * Suppress CVE-2022-41881 (CASSANDRA-18148)
* Default role is created with zero timestamp (CASSANDRA-12525)
* Suppress CVE-2021-37533 (CASSANDRA-18146)
* Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira
(CASSANDRA-18126)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
