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 60269bff2bd2e11fefdbe11747cca75491e6c9df
Merge: 4f5feac 234bdc8
Author: Brandon Williams <[email protected]>
AuthorDate: Fri Mar 25 06:15:41 2022 -0500

    Merge branch 'cassandra-3.11' into cassandra-4.0

 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc CHANGES.txt
index 1bdf518,4e73721..2b0b683
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,9 +1,18 @@@
 -3.11.13
 - * Upgrade slf4j to 1.7.25
 +4.0.4
 + * 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)
- Merged from 3.11:
+  * 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:
   * ConnectionLimitHandler may leaks connection count if remote connection 
drops (CASSANDRA-17252)
   * Require ant >= 1.10 (CASSANDRA-17428)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to