This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit a4c9a408e6cb98549a3ea38ef53e11f614579349
Merge: c3d51a8 f18b432
Author: Brandon Williams <[email protected]>
AuthorDate: Mon Feb 28 07:45:48 2022 -0600

    Merge branch 'cassandra-3.0' into cassandra-3.11

 .build/dependency-check-suppressions.xml | 3 +++
 CHANGES.txt                              | 1 +
 2 files changed, 4 insertions(+)

diff --cc CHANGES.txt
index 7dcde0b,d6bbcd7..b055b12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,13 +1,26 @@@
 -3.0.27
 +3.11.13
 +Merged from 3.0:
+  * Suppress inapplicable CVEs (CASSANDRA-17368)
   * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
   * 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to