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

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

commit fabc6e7c7b1ceee21408fdb15822370042339e28
Merge: 203c61abaf ee266d283e
Author: Marcus Eriksson <[email protected]>
AuthorDate: Fri Dec 23 14:59:59 2022 +0100

    Merge branch 'cassandra-4.0' into cassandra-4.1

 CHANGES.txt                                                             | 1 +
 .../apache/cassandra/db/compaction/DateTieredCompactionStrategy.java    | 2 +-
 .../apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java    | 2 +-
 .../apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --cc CHANGES.txt
index e5c97ddb54,b9ab8981ec..ad78142df5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,12 +1,8 @@@
 -4.0.8
 +4.1.1
 +Merged from 4.0:
+  * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables 
(CASSANDRA-17977)
   * Restore internode custom tracing on 4.0's new messaging system 
(CASSANDRA-17981)
 - * Harden parsing of boolean values in CQL in PropertyDefinitions 
(CASSANDRA-17878)
 - * Fix error message about type hints (CASSANDRA-17915)
 - * Fix possible race condition on repair snapshots (CASSANDRA-17955)
 - * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
  Merged from 3.11:
 - * Fix Splitter sometimes creating more splits than requested 
(CASSANDRA-18013)
  Merged from 3.0:
   * Avoid anticompaction mixing data from two different time windows with TWCS 
(CASSANDRA-17970)
   * Do not spam the logs with MigrationCoordinator not being able to pull 
schemas (CASSANDRA-18096)


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

Reply via email to