You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2023/10/26 11:08:03 UTC

[cassandra] 01/03: Merge branch 'cassandra-3.0' into cassandra-3.11

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

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit cec0e1b86420da90e97c6d1dc5c19d16bfe88d8b
Merge: 3987160bb2 5bf1d2f8d5
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Oct 26 05:55:46 2023 -0500

    Merge branch 'cassandra-3.0' into cassandra-3.11

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

diff --cc CHANGES.txt
index dc7c263cc8,4906a982f3..0f0ea5ffde
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,10 @@@
 +3.11.17
 + * 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)
 +Merged from 3.0:
+ 3.0.30
+  * Suppress CVE-2023-44487 (CASSANDRA-18943)
   * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935)
   * Implement the logic in bin/stop-server (CASSANDRA-18838) 
   * Upgrade snappy-java to 1.1.10.4 (CASSANDRA-18878)


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