You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2022/07/28 20:34:38 UTC
[cassandra] branch trunk updated (ea03af4605 -> 0e3bdeab73)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from ea03af4605 Merge branch 'cassandra-4.1' into trunk
add 04901913d6 Fix Setting Virtual Table to update after startup config properties gc_log_threshold_in_ms, gc_warn_threshold_in_ms, conf.index_summary_capacity_in_mb, prepared_statements_cache_size_mb, key_cache_size_in_mb, counter_cache_size_in_mb patch by Ekaterina Dimitrova; reviewed by Andres de la Pena for CASSANDRA-17737
add 222f66e093 Merge branch 'cassandra-4.0' into cassandra-4.1
new 0e3bdeab73 Merge branch 'cassandra-4.1' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 3 ++
src/java/org/apache/cassandra/config/Config.java | 4 +--
.../cassandra/config/DatabaseDescriptor.java | 19 ++++++++++++
.../org/apache/cassandra/service/GCInspector.java | 36 ++++++++++++----------
.../apache/cassandra/service/GCInspectorTest.java | 17 +++++++++-
5 files changed, 60 insertions(+), 19 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0e3bdeab73ad89b7f48fd366b1b2723f5800e784
Merge: ea03af4605 222f66e093
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Thu Jul 28 16:22:06 2022 -0400
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 3 ++
src/java/org/apache/cassandra/config/Config.java | 4 +--
.../cassandra/config/DatabaseDescriptor.java | 19 ++++++++++++
.../org/apache/cassandra/service/GCInspector.java | 36 ++++++++++++----------
.../apache/cassandra/service/GCInspectorTest.java | 17 +++++++++-
5 files changed, 60 insertions(+), 19 deletions(-)
diff --cc CHANGES.txt
index bcdedebb7b,4d9685864c..47d08b305d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -38,11 -17,14 +38,14 @@@ Merged from 4.1
* 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:
+ * Fix Setting Virtual Table - update after startup config properties gc_log_threshold_in_ms, gc_warn_threshold_in_ms,
+ conf.index_summary_capacity_in_mb, prepared_statements_cache_size_mb, key_cache_size_in_mb, counter_cache_size_in_mb
+ (CASSANDRA-17737)
* Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for in-JVM dtests (CASSANDRA-17731)
* Remove extra write to system table for prepared statements (CASSANDRA-17764)
-Merged from 3.11:
+Merge from 3.11:
* Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759)
-Merged from 3.0:
+Merge from 3.0:
* Fix restarting of services on gossipping-only member (CASSANDRA-17752)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org