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 d1270c204f31578212bfca5860ab46abeaec22b9
Merge: c9e1f42dd6 cde152cdb7
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Wed Apr 13 07:07:51 2022 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 4 ----
1 file changed, 4 deletions(-)
diff --cc CHANGES.txt
index a354318a59,37cf1e563e..0fc564e776
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,13 +1,24 @@@
- <<<<<<< HEAD
-3.11.13
- * Upgrade slf4j to 1.7.25 (CASSANDRA-17474)
- * Upgrade jackson to 2.13.2 (CASSANDRA-17492)
+4.0.4
+ * Clean up schema migration coordinator and tests (CASSANDRA-17533)
+ * Shut repair task executor down without interruption to avoid compromising
shared channel proxies (CASSANDRA-17466)
+ * Generate valid KEYSPACE / MATERIALIZED VIEW for CQL for views
(CASSANDRA-17266)
+ * Fix timestamp tz parsing (CASSANDRA-17467)
+ * Suppress CVE-2021-44521 from driver (CASSANDRA-17459)
+ * Upgrade jackson to 2.13.2 (CASSANDRA-17460)
+ * Make sstableloader honour native port option (CASSANDRA-17210)
+ * Reject snapshot names with special character (CASSANDRA-15297)
+ * 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)
* emit warning on keyspace creation when replication factor is bigger than
the number of nodes (CASSANDRA-16747)
* Fix snapshot true size calculation (CASSANDRA-17267)
- * Validate existence of DCs when repairing (CASSANDRA-17407)
* 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:
- =======
- 3.0.27
* Add procps dependency to RPM/Debian packages (CASSANDRA-17516)
* Suppress CVE-2021-44521 (CASSANDRA-17492)
- >>>>>>> 6bdfe13283 (Add procps Debian dependency)
* ConnectionLimitHandler may leaks connection count if remote connection
drops (CASSANDRA-17252)
* Require ant >= 1.10 (CASSANDRA-17428)
* Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
