diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2019-10-22 16:36:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-22 16:36:10 +0200 |
commit | 2433a37c22b225195873efa0c08897c18133f63f (patch) | |
tree | 78f11e55eb2e65b2551f37a61380fe2f3a6155a6 /config-model | |
parent | fd2ec77369f8ef58c844bc6dc912be1fdd2c1118 (diff) | |
parent | 1e1c32d1e7bbe6edc7741e34bafeec6dcca5c3ac (diff) |
Merge pull request #11045 from vespa-engine/revert-11041-revert-11040-revert-11032-revert-11027-revert-11025-revert-11012-revert-11010-hmusum/move-ZooKeeperServer
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.java | 3 |
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 |