This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fdc055da124efc92a73bd208b4463ee5528c85e0
Merge: 16f8f8f 78143bc
Author: Alex Petrov <oleksandr.pet...@gmail.com>
AuthorDate: Wed Dec 18 18:15:26 2019 +0100
Merge branch 'cassandra-3.11' into trunk
.../org/apache/cassandra/distributed/impl/AbstractCluster.java | 3 ++-
.../org/apache/cassandra/distributed/impl/InstanceConfig.java | 6 ++++--
.../org/apache/cassandra/distributed/test/GossipSettlesTest.java | 9 +++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
index fcedf21,3e556d6..bd425f6
--- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
@@@ -114,9 -115,7 +115,9 @@@ public class InstanceConfig implements
.set("storage_port", 7012)
.set("endpoint_snitch", DistributedTestSnitch.class.getName())
.set("seed_provider", new
ParameterizedClass(SimpleSeedProvider.class.getName(),
- Collections.singletonMap("seeds", "127.0.0.1:7012")))
- Collections.singletonMap("seeds", seedIp)))
++ Collections.singletonMap("seeds", seedIp + ":7012")))
+ // required settings for dtest functionality
+ .set("diagnostic_events_enabled", true)
.set("auto_bootstrap", false)
// capacities that are based on `totalMemory` that should be
fixed size
.set("index_summary_capacity_in_mb", 50l)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
