This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9d6c3c43b8f8629ad0538aca6f8e08f5fcef4acc
Merge: bb66561142 7076623ac7
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Wed Apr 2 12:09:57 2025 +0200

    Merge branch 'cassandra-5.0' into trunk

 .build/owasp/dependency-check-suppressions.xml | 6 ++++++
 .snyk                                          | 2 ++
 CHANGES.txt                                    | 1 +
 3 files changed, 9 insertions(+)

diff --cc CHANGES.txt
index c1ee79f162,c9dbd21a4f..9bf7069174
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -211,10 -21,8 +211,11 @@@ Merged from 4.1
   * 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)
 + * Run audit_logging_options through santiation and validation on startup 
(CASSANDRA-20208)
 + * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
 + * Fix race condition in DecayingEstimatedHistogramReservoir during rescale 
(CASSANDRA-19365)
  Merged from 4.0:
+  * Suppress CVE-2025-25193 (CASSANDRA-20504)
   * 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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to