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 04c1289bb96a656bfc9cbf9eb7eb1ff9358f4b6f
Merge: 59ea4f8 b18a9f0
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue Mar 8 17:20:50 2022 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/service/StorageService.java | 7 +++++++
2 files changed, 10 insertions(+)
diff --cc CHANGES.txt
index 9320244,c6708f5..af8983a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,8 +1,13 @@@
-3.11.13
- * Validate existence of DCs when repairing (CASSANDRA-17407)
+4.0.4
+ * Fix ObjectSizes implementation and usages (CASSANDRA-17402)
+ * Fix race condition bug during local session repair (CASSANDRA-17335)
+ * Fix ignored streaming encryption settings in sstableloader
(CASSANDRA-17367)
+ * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349)
+ * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349)
++Merged from 3.11:
+ * dropping of a materialized view creates a snapshot with dropped- prefix
(CASSANDRA-17415)
++ * Validate existence of DCs when repairing (CASSANDRA-17407)
Merged from 3.0:
- * filter out NULL_VERSION entries from peers table in ConfiguredLimit
(CASSANDRA-16518)
* Suppress inapplicable CVEs (CASSANDRA-17368)
* Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
(CASSANDRA-17338)
* Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
