diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-18 08:56:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 08:56:15 +0200 |
| commit | 26b8e6a8f25e4df000bc0143ef1b295efd5d4e4e (patch) | |
| tree | 0a65db84c7b15ea390aa79694ac73ab8b59d3695 /configserver | |
| parent | 09b9a84eeb6b2124c356bc1065fd54b596abb37e (diff) | |
Revert "Move ZooKeeperServer to another module"
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index 54961945407..8f939e54d55 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -20,5 +20,4 @@ install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configse install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar) install_symlink(lib/jars/node-repository-jar-with-dependencies.jar conf/configserver-app/components/node-repository.jar) install_symlink(lib/jars/zkfacade-jar-with-dependencies.jar conf/configserver-app/components/zkfacade.jar) -install_symlink(lib/jars/zookeeper-server-jar-with-dependencies.jar conf/configserver-app/components/zookeeper-server.jar) install_symlink(conf/configserver-app/components lib/jars/config-models) diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 25e6a727841..97b2156e8ca 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -11,7 +11,7 @@ <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.monitoring.Metrics" bundle="configserver" /> - <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zookeeper-server" /> + <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zkfacade" /> <component id="com.yahoo.vespa.config.server.rpc.RpcServer" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.ConfigServerDB" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.session.FileDistributionFactory" bundle="configserver" /> |