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

blambov pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 970ec2d1db5770c13a42e1f2862ea398317d0f15
Merge: e1fc195558 a23f4c0b15
Author: Branimir Lambov <[email protected]>
AuthorDate: Thu Sep 21 17:20:29 2023 +0300

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                        |   1 +
 .../db/compaction/CompactionController.java        |  12 +-
 .../db/compaction/CompactionControllerTest.java    | 141 +++++++++++++++++++++
 3 files changed, 147 insertions(+), 7 deletions(-)

diff --cc CHANGES.txt
index a998a12c81,f4c57d0444..f0be56e5e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -230,8 -210,12 +230,9 @@@ Merged from 4.1
  Merged from 4.0:
   * Partial compaction can resurrect deleted data (CASSANDRA-18507)
  Merged from 3.11:
+  * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration 
(CASSANDRA-18756)
 - * Revert CASSANDRA-18543 (CASSANDRA-18854)
   * Fix NPE when using udfContext in UDF after a restart of a node 
(CASSANDRA-18739)
  Merged from 3.0:
 - * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
 - * Make alternation of a user type validate the same way as creation of a 
user type does (CASSANDRA-18585)
   * CQLSH emits a warning when the server version doesn't match 
(CASSANDRA-18745)
   * Fix missing speculative retries in tablestats (CASSANDRA-18767)
   * Fix Requires for Java for RPM package (CASSANDRA-18751)


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

Reply via email to