You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2026/09/15 14:07:38 UTC
(cassandra) branch trunk updated (1ef9702d77 -> e4e7d5c15c)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 1ef9702d77 Merge branch 'cassandra-6.0' into trunk
add 3ccf94763b Fix typos in cassandra.yaml
add f2f3e8e131 Merge branch 'cassandra-4.0' into cassandra-4.1
add e058081a6d Merge branch 'cassandra-4.1' into cassandra-5.0
add 306a4b168b Merge branch 'cassandra-5.0' into cassandra-6.0
new e4e7d5c15c Merge branch 'cassandra-6.0' 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:
conf/cassandra.yaml | 62 +++++++++++++++++++++++-----------------------
conf/cassandra_latest.yaml | 44 ++++++++++++++++----------------
2 files changed, 53 insertions(+), 53 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-6.0' into trunk
Posted by sm...@apache.org.
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 <sm...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org