This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a9911afe9a2787636cf9a39b564b1256e6285f86
Merge: 4effa4efbe fc36817033
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Apr 3 06:08:52 2023 -0500
Merge branch 'cassandra-4.1' into trunk
.build/dependency-check-suppressions.xml | 5 +++++
CHANGES.txt | 1 +
2 files changed, 6 insertions(+)
diff --cc CHANGES.txt
index 5c8a04819f,c0a6b14f57..2a6f675ddb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -133,9 -6,10 +133,10 @@@
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
Merged from 4.0:
Merged from 3.11:
+ * Suppress CVE-2022-45688 (CASSANDRA-18389)
-Merged from 3.0:
+Merged from 3.0:
* Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
-
+
4.1.1
* Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984)
* Fix too early schema version change in sysem local table (CASSANDRA-18291)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
