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 60200ba613a71353a8738951ffb9b3f7b885e7b7
Merge: c32a848008 6b99db84ba
Author: Brandon Williams <[email protected]>
AuthorDate: Mon Jun 5 05:59:24 2023 -0500

    Merge branch 'cassandra-4.1' into trunk

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

diff --cc CHANGES.txt
index aa7c989d76,30d96a0948..d27b503a0a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -151,11 -3,11 +151,13 @@@ Merged from 4.0
   * Remove unnecessary shuffling of GossipDigests in 
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
  Merged from 3.11:
  Merged from 3.0:
+ 3.0.30
+  * Suppress CVE-2023-2976 (CASSANDRA-18562)
   * Remove dh_python use in Debian packaging (CASSANDRA-18558)
  
 +
  4.1.2
 + * NPE when deserializing malformed collections from client (CASSANDRA-18505)
   * Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124)
   * Return snapshots with dots in their name in nodetool listsnapshots 
(CASSANDRA-18371)
   * Fix NPE when loading snapshots and data directory is one directory from 
root (CASSANDRA-18359)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to