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 593872cb28b97e87ee5e74975c11d602cb5414dd
Merge: e77738f 679740f
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Fri Feb 18 11:13:35 2022 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
NEWS.txt | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --cc CHANGES.txt
index b707c12,6705934..a7a7eed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,11 +1,24 @@@
-3.0.27
+3.11.13
+Merged from 3.0:
* Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
- * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
* Lazy transaction log replica creation allows incorrect replica content
divergence during anticompaction (CASSANDRA-17273)
+ * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
-3.0.26
+3.11.12
+ * Extend operator control over the UDF threading model for CVE-2021-44521
(CASSANDRA-17352)
+ * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028)
+ * Add key validation to ssstablescrub (CASSANDRA-16969)
+ * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
+ * Include SASI components to snapshots (CASSANDRA-15134)
+ * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
(CASSANDRA-16854)
+ * Validate SASI tokenizer options before adding index to schema
(CASSANDRA-15135)
+ * Fixup scrub output when no data post-scrub and clear up old use of row,
which really means partition (CASSANDRA-16835)
+ * Fix ant-junit dependency issue (CASSANDRA-16827)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer
(CASSANDRA-16072)
+ * Avoid sending CDC column if not enabled (CASSANDRA-16770)
+Merged from 3.0:
* Fix conversion from megabits to bytes in streaming rate limiter
(CASSANDRA-17243)
* Upgrade logback to 1.2.9 (CASSANDRA-17204)
* Avoid race in AbstractReplicationStrategy endpoint caching
(CASSANDRA-16673)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
