This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6b99db84bace738f9851b66bfe2b94e862cb6b31
Merge: cdcf9bb5a6 be8cd8ab6b
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Jun 5 05:59:16 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 2 ++
2 files changed, 3 insertions(+)
diff --cc CHANGES.txt
index 72eef1ddae,8e02cee7f2..30d96a0948
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,16 -2,11 +3,18 @@@ 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.0.10
+4.1.2
+ * 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)
+ * Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304)
+ * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
+ * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
+Merged from 4.0:
* Improve nodetool enable{audit,fullquery}log (CASSANDRA-18550)
* Report network cache info in nodetool (CASSANDRa-18400)
* Partial compaction can resurrect deleted data (CASSANDRA-18507)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
