This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ef3dc6491e1dddfd7009ed422acaebfb51fd0a2b
Merge: 2a5749f203 9abed87ba4
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sun Mar 30 09:28:40 2025 +0200
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
Autogenerate toplevel .snyk file from owasp suppressions
.build/build-owasp.xml | 3 ++
.build/build-rat.xml | 1 +
.build/generate-snyk-file | 75 +++++++++++++++++++++++++++++++++++++++++
.snyk | 50 +++++++++++++++++++++++++++
CHANGES.txt | 1 +
build.xml | 3 +-
debian/rules | 2 +-
redhat/cassandra.spec | 2 +-
redhat/noboolean/cassandra.spec | 2 +-
9 files changed, 135 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index d7b2baed6c,a1d17c3e5f..824a0ae8e7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-4.0.18
+4.1.9
+ * Fix paxos mixed mode infinite loop (CASSANDRA-20493)
+ * Optionally skip exception logging on invalid legacy protocol magic
exception (CASSANDRA-19483)
+ * Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)
+ * Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking
thread is interrupted (CASSANDRA-20084)
+Merged from 4.0:
+ * Include in source tree and build packages a Snyk policy file that lists
known false positives (CASSANDRA-20319)
* Update zstd-jni to 1.5.7-2 (CASSANDRA-20453)
* Suppress CVE-2024-12801 (CASSANDRA-20412)
* Suppress CVE-2024-12798 (CASSANDRA-20408)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
