This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 13e595628548e7cdf06dd666a3d839af8fad6655
Merge: 4059faf5b9 8e5fc74c9a
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Wed Dec 6 06:32:48 2023 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
.build/dependency-check-suppressions.xml | 9 +++++++++
CHANGES.txt | 1 +
2 files changed, 10 insertions(+)
diff --cc CHANGES.txt
index 10096d23f2,771cf1f3c0..79e8ee7a84
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -26,7 -20,9 +26,8 @@@ Merged from 3.11
* Fix delayed SSTable release with unsafe_aggressive_sstable_expiration
(CASSANDRA-18756)
* Revert CASSANDRA-18543 (CASSANDRA-18854)
* Fix NPE when using udfContext in UDF after a restart of a node
(CASSANDRA-18739)
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
+ * Suppress CVE-2023-6378 (CASSANDRA-19142)
* Do not set RPC_READY to false on transports shutdown in order to not fail
counter updates for deployments with coordinator and storage nodes with
transports turned off (CASSANDRA-18935)
* Suppress CVE-2023-44487 (CASSANDRA-18943)
* Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip
(CASSANDRA-18935)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
