This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4a804eb807a1bd10ad30f2fac08db3217fe26e3a
Merge: ce075b3 81e4725
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Mar 10 10:58:47 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11 (including c8d2394,
6524903, cf0be97)
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc CHANGES.txt
index 26f07fe,567764e..3b4b8fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -4,18 -2,12 +4,18 @@@ Merged from 3.0
* Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades
(CASSANDRA-16415)
* Avoid pushing schema mutations when setting up distributed system
keyspaces locally (CASSANDRA-16387)
Merged from 2.2:
- * Fix centos packaging for arm64, >=3.0 rpm's now require python3
(CASSANDRA-16477)
+ * Fix centos packaging for arm64, >=4.0 rpm's now require python3
(CASSANDRA-16477)
* 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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
