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 2025/03/11 20:18:59 UTC
(cassandra) 05/05: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 14f2b67493abe7390a6ec44eca4efeefe51de0c3
Merge: d509d2fcbe 9b8ecb1883
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 11 15:15:08 2025 -0500
Merge branch 'cassandra-4.1' into cassandra-5.0
CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
diff --cc CHANGES.txt
index a0726e8a36,ff0be82b8d..fa2ab2e885
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,8 -2,10 +16,11 @@@ Merged from 4.1
* 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:
+ * Suppress CVE-2024-12801 (CASSANDRA-20412)
+ * Suppress CVE-2024-12798 (CASSANDRA-20408)
+ * Support null column value tombstones in FQL batch statements (CASSANDRA-20397)
* Fix autocompletion for role names/user names (CASSANDRA-20175)
+ * Support null column value tombstones in FQL batch statements (CASSANDRA-20397)
* Update Zstd library to 1.5.7-1 (CASSANDRA-20367)
* Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org