This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 22279a4b75fbf03c98df4eb1af93d1417bef810b
Merge: a1a26e8 4d1d024
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Tue Nov 10 10:46:33 2020 -0800
Merge branch 'cassandra-2.2' into cassandra-3.0
.../cassandra/config/YamlConfigurationLoader.java | 10 +++++--
.../apache/cassandra/distributed/Constants.java | 34 ++++++++++++++++++++++
.../cassandra/distributed/UpgradeableCluster.java | 1 +
.../distributed/impl/AbstractCluster.java | 3 +-
.../cassandra/distributed/impl/Instance.java | 8 +++--
5 files changed, 51 insertions(+), 5 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index f72661d,82251d7..ff0095d
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -133,7 -129,7 +134,7 @@@ public class Instance extends IsolatedE
{
super("node" + config.num(), classLoader);
this.config = config;
-- Object clusterId =
Objects.requireNonNull(config.get("dtest.api.cluster_id"), "cluster_id is not
defined");
++ Object clusterId =
Objects.requireNonNull(config.get(Constants.KEY_DTEST_API_CLUSTER_ID),
"cluster_id is not defined");
ClusterIDDefiner.setId("cluster-" + clusterId);
InstanceIDDefiner.setInstanceId(config.num());
FBUtilities.setBroadcastInetAddress(config.broadcastAddress().getAddress());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
