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

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

commit 962247a49333e4fd3c93d13e9ae501f99fe947a9
Merge: 9beeaf87bd a53bb7ab82
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Jul 22 11:30:13 2022 -0500

    Merge branch 'cassandra-4.0' into cassandra-4.1

 CHANGES.txt                                            | 4 ++++
 src/java/org/apache/cassandra/cql3/QueryProcessor.java | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 60fc82e9ab,42cee13675..3e4f28a657
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,12 +1,25 @@@
 -4.0.6
 - * Fix Settings Virtual Table - index_summary_resize_interval and 
index_summary_capacity were not updated after startup (CASSANDRA-17735)
 +4.1-alpha2
 + * index_summary_resize_interval_in_minutes = -1 is equivalent to 
index_summary_resize_interval being set to null or
 +   disabled. JMX MBean IndexSummaryManager, setResizeIntervalInMinutes method 
still takes resizeIntervalInMinutes = -1 for disabled (CASSANDRA-17735)
 + * min_tracked_partition_size_bytes parameter from 4.1 alpha1 was renamed to 
min_tracked_partition_size (CASSANDRA-17733)
 + * Remove commons-lang dependency during build runtime (CASSANDRA-17724)
 + * Relax synchronization on StreamSession#onError() to avoid deadlock 
(CASSANDRA-17706)
 + * Fix AbstractCell#toString throws MarshalException for cell in collection 
(CASSANDRA-17695)
 + * Add new vtable output option to compactionstats (CASSANDRA-17683)
 + * Fix commitLogUpperBound initialization in AbstractMemtableWithCommitlog 
(CASSANDRA-17587)
 + * Fix widening to long in getBatchSizeFailThreshold (CASSANDRA-17650)
 + * Fix widening from mebibytes to bytes in IntMebibytesBound (CASSANDRA-17716)
 + * Revert breaking change in nodetool clientstats and expose cient options 
through nodetool clientstats --client-options. (CASSANDRA-17715)
 + * Fix missed nowInSec values in QueryProcessor (CASSANDRA-17458)
 + * Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder 
class and deprecate it in favor of withBufferSizeInMiB(int size) 
(CASSANDRA-17675)
 + * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
 +Merged from 4.0:
   * Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for 
in-JVM dtests (CASSANDRA-17731)
+  * Remove extra write to system table for prepared statements 
(CASSANDRA-17764)
+ 
+ 
+ 4.0.5
   * Utilise BTree improvements to reduce garbage and improve throughput 
(CASSANDRA-15511)
 - * Make sure existing delayed tasks in StreamTransferTask cannot prevent 
clean shutdown (CASSANDRA-17706)
   * SSL storage port in sstableloader is deprecated (CASSANDRA-17602)
   * Fix counter write timeouts at ONE (CASSANDRA-17411)
   * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to