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

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

commit a621de992a727266d0207c952c5ba552b1e7a898
Merge: 84cb2ae7d4 7085aa5242
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Mon Aug 17 12:59:29 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                                    |  1 +
 NEWS.txt                                                       |  3 +++
 conf/cassandra.yaml                                            |  6 +++++-
 conf/cassandra_latest.yaml                                     |  6 ++++++
 src/java/org/apache/cassandra/cache/AutoSavingCache.java       |  2 +-
 src/java/org/apache/cassandra/config/Config.java               |  2 +-
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java   |  4 ++--
 src/java/org/apache/cassandra/hints/HintsWriter.java           |  4 ++--
 .../org/apache/cassandra/index/sai/disk/io/IndexFileUtils.java |  2 +-
 src/java/org/apache/cassandra/io/sstable/IOOptions.java        |  2 +-
 src/java/org/apache/cassandra/io/util/SequentialWriter.java    |  2 +-
 .../org/apache/cassandra/io/util/SequentialWriterOption.java   | 10 +++++-----
 test/conf/latest_diff.yaml                                     |  2 --
 13 files changed, 29 insertions(+), 17 deletions(-)

diff --cc CHANGES.txt
index 7b6608ac15,1dd6a5db8f..3114310058
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -6.0-alpha3
 +7.0
 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366)
 + * Don't increment client metrics on messaging service connection unpause 
(CASSANDRA-21491)
 + * Add nodetool getreplicas (CASSANDRA-17665)
 + * Implementation of CEP-49: Hardware-accelerated compression 
(CASSANDRA-20975)
 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394)
 + * Allow nodetool garbagecollect to take a user defined list of SSTables 
(CASSANDRA-16767)
 + * Add a guardrail for misprepared statements (CASSANDRA-21139)
 +Merged from 6.0:
+  * Enable trickle fsync by default (CASSANDRA-21572)
   * Protect uncaught_exceptions virtual table against the crash path 
(CASSANDRA-21578)
   * Optimize ServerConnection.requests for both reads and writes 
(CASSANDRA-21569)
   * Ensure transferred_ranges reset on decommision re-attempt when pending 
ranges cannot be proven continous (CASSANDRA-16290)
diff --cc NEWS.txt
index 028266355f,1f82fb6809..72a09a57e3
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -74,22 -74,6 +74,24 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +7.0
 +===
 +
 +New features
 +------------
 +
 +    - CEP-49 - it is possible to implement custom compression providers, e.g.
 +      integrating with a specialized hardware which makes de/compression 
faster.
 +      See CASSANDRA-20975 for more information.
 +
 +Upgrading
 +---------
 +
++    - trickle_fsync is by default set to "true" instead of "false" in 
cassandra.yaml (see CASSANDRA-21572)
++
 +Deprecation
 +-----------
 +
  
  6.0
  ===


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

Reply via email to