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 e4e7d5c15c523b78748f22d6f057dd47865f7e17 Merge: 1ef9702d77 306a4b168b Author: Stefan Miklosovic <[email protected]> AuthorDate: Tue Sep 15 16:03:54 2026 +0200 Merge branch 'cassandra-6.0' into trunk conf/cassandra.yaml | 62 +++++++++++++++++++++++----------------------- conf/cassandra_latest.yaml | 44 ++++++++++++++++---------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --cc conf/cassandra.yaml index 585399f6fc,0e19eca3b7..ece1cc445a --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1620,7 -1600,7 +1620,7 @@@ slow_query_log_timeout: 500m # of the snitch, which will be assumed to be on your classpath. endpoint_snitch: SimpleSnitch --# The settings in the following section are intended to supercede the use of endpoint_snitch: ++# The settings in the following section are intended to supersede the use of endpoint_snitch: # initial_location_provider # node_proximity # addresses_config (optional) diff --cc conf/cassandra_latest.yaml index df4ba596e8,5e15d25225..6c27cdbc98 --- a/conf/cassandra_latest.yaml +++ b/conf/cassandra_latest.yaml @@@ -1501,7 -1481,7 +1501,7 @@@ slow_query_log_timeout: 500m # most users should never need to adjust this. # phi_convict_threshold: 8 --# The settings in the following section are intended to supercede the use of endpoint_snitch: ++# The settings in the following section are intended to supersede the use of endpoint_snitch: # initial_location_provider # node_proximity # addresses_config (optional) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
