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 33c60d8daf7b25ffc80136289aaa4e6c9589b2c0
Merge: 279f284da5 8889b27c9c
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Dec 5 10:10:37 2022 -0600
Merge branch 'cassandra-4.1' into trunk
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 1 +
2 files changed, 2 insertions(+)
diff --cc CHANGES.txt
index 98a63a6aa8,4b26f3a24e..79590ddad6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -158,10 -87,6 +158,11 @@@ Merged from 3.11
* Creating of a keyspace on insufficient number of replicas should filter
out gosspping-only members (CASSANDRA-17759)
* Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
Merged from 3.0:
++ * Suppress CVE-2022-41854 and similar (CASSANDRA-18083)
+ * Fix running Ant rat targets without git (CASSANDRA-17974)
+ * Harden JMX by resolving beanshooter issues (CASSANDRA-17921)
+ * Suppress CVE-2019-2684 (CASSANDRA-17965)
+ * Fix auto-completing "WITH" when creating a materialized view
(CASSANDRA-17879)
* Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767)
* Fix restarting of services on gossipping-only member (CASSANDRA-17752)
* Fix scrubber falling into infinite loop when the last partition is broken
(CASSANDRA-17862)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
