You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/02/01 17:42:49 UTC
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a249e6c7c9c8e090686fb09134f6d67da307809d
Merge: ed51d02 08be5e0
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Mon Feb 1 17:35:54 2021 +0000
Merge branch 'cassandra-3.0' into cassandra-3.11
# Conflicts:
# CHANGES.txt
CHANGES.txt | 2 ++
.../apache/cassandra/locator/TokenMetadata.java | 40 ++++++++++++++++++----
.../cassandra/locator/TokenMetadataTest.java | 24 +++++++++++++
3 files changed, 59 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 1bc4957,da8ceaa..4e805ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,10 +1,17 @@@
-3.0.25:
+3.11.11
+ Merged from 2.2:
+ * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
-3.0.24:
- * Prevent unbounded number of pending flushing tasks; Add PendingFlushTasks metric (CASSANDRA-16261)
+3.11.10
+ * Fix digest computation for queries with fetched but non queried columns (CASSANDRA-15962)
+ * Reduce amount of allocations during batch statement execution (CASSANDRA-16201)
+ * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
+ * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
+ * Rate limit validation compactions using compaction_throughput_mb_per_sec (CASSANDRA-16161)
+ * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to default of 1GB (CASSANDRA-16071)
+Merged from 3.0:
+ * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
* Improve empty hint file handling during startup (CASSANDRA-16162)
* Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
* Fix skipping on pre-3.0 created compact storage sstables due to missing primary key liveness (CASSANDRA-16226)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org