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


The following commit(s) were added to refs/heads/trunk by this push:
     new 7daa656  Fix changes
7daa656 is described below

commit 7daa65675f01a84788af178af5b7c08de14423e3
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Mar 2 08:31:15 2022 -0600

    Fix changes
---
 CHANGES.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 71cf70c..f08ccaa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -98,14 +98,6 @@ Merged from 4.0:
  * Fix ignored streaming encryption settings in sstableloader (CASSANDRA-17367)
  * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349)
  * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349)
-Merged from 3.0:
- * 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)
-
-4.0.3
  * Deprecate otc_coalescing_strategy, otc_coalescing_window_us, 
otc_coalescing_enough_coalesced_messages,
    otc_backlog_expiration_interval_ms (CASSANDRA-17377)
  * Improve start up processing of Incremental Repair information read from 
system.repairs (CASSANDRA-17342)
@@ -161,6 +153,7 @@ Merged from 3.11:
  * 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:
+ * 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)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to