This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 03ef67c9d54a8cd52e120ffceb033fc49403dc2b
Merge: 74bb6d8496 a46e467737
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Sun Apr 17 14:38:37 2022 -0400
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
.../db/marshal/AbstractCompositeType.java | 6 +--
.../cassandra/distributed/test/BooleanTest.java | 45 ++++++++++++++++++++++
.../apache/cassandra/db/SchemaCQLHelperTest.java | 2 +-
4 files changed, 50 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 09f097c22e,67985868f0..ed00f8bca7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -202,24 -70,7 +202,25 @@@ 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:
++ * Fix data corruption in AbstractCompositeType due to static boolean byte
buffers (CASSANDRA-14752)
+ * Add procps dependency to RPM/Debian packages (CASSANDRA-17516)
+ * Suppress CVE-2021-44521 (CASSANDRA-17492)
+ * ConnectionLimitHandler may leaks connection count if remote connection
drops (CASSANDRA-17252)
+ * 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
