aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-10-21 09:53:42 +0200
committerGitHub <noreply@github.com>2019-10-21 09:53:42 +0200
commit500dfd24c9ddb4e86f06abe79b7b3a4cebcabb7b (patch)
tree3215fcf4ff60b7dbda9fb000aa65440e7a21fd01 /config-model
parent1e9da543a5f9388efd9e4a43ee1fb661d0f76ce6 (diff)
Revert "Reapply "Move ZooKeeperServer to another module"""
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index e45bf3f0921..a9af815aa1e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -29,7 +29,7 @@ public class ClusterControllerContainer extends Container implements
ZookeeperServerConfig.Producer
{
private static final ComponentSpecification CLUSTERCONTROLLER_BUNDLE = new ComponentSpecification("clustercontroller-apps");
- private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zookeeper-server");
+ private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zkfacade");
private final Set<String> bundles = new TreeSet<>();
@@ -59,7 +59,6 @@ public class ClusterControllerContainer extends Container implements
addFileBundle("lib/jars/clustercontroller-apputil-jar-with-dependencies.jar");
addFileBundle("lib/jars/clustercontroller-core-jar-with-dependencies.jar");
addFileBundle("lib/jars/clustercontroller-utils-jar-with-dependencies.jar");
- addFileBundle("lib/jars/zookeeper-server-jar-with-dependencies.jar");
}
@Override