This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3b1ce69fc1609538be8eac81c4ac4da12af49bff
Merge: 0ecd480 d9bd035
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Mar 14 14:09:31 2022 -0500
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
build.xml | 9 +++++++++
2 files changed, 10 insertions(+)
diff --cc CHANGES.txt
index 0726f04,e9b5b43..c57742f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -156,20 -57,7 +156,21 @@@ Merged from 3.11
* Add key validation to ssstablescrub (CASSANDRA-16969)
* Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
* Make assassinate more resilient to missing tokens (CASSANDRA-16847)
+ * 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)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer
(CASSANDRA-16072)
+ * Make cqlsh use the same set of reserved keywords than the server uses
(CASSANDRA-15663)
+ * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
+ * Enable tombstone compactions when unchecked_tombstone_compaction is set in
TWCS (CASSANDRA-14496)
+ * Read only the required SSTables for single partition queries
(CASSANDRA-16737)
Merged from 3.0:
++ * Require ant >= 1.10 (CASSANDRA-17428)
+ * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
+ * Suppress inapplicable CVEs (CASSANDRA-17368)
+ * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
(CASSANDRA-17338)
+ * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
+ * Lazy transaction log replica creation allows incorrect replica content
divergence during anticompaction (CASSANDRA-17273)
+ * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
* 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
