diff options
| author | hakonhall <hakon@oath.com> | 2017-10-04 11:34:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 11:34:51 +0200 |
| commit | 717dc0312bdd21714abfb5788536a37d83eda6b0 (patch) | |
| tree | ac9a80584e5e8bcb5c7b0944805c494bb66a451e | |
| parent | c110e9aff4234599725eb3229207fd9a0c330a55 (diff) | |
| parent | aa34d7ec772c670553c283caa08a39013fc3d278 (diff) | |
Merge pull request #3643 from vespa-engine/revert-3627-revert-3624-revert-3623-revert-3617-revert-3607-hakon/enable-new-servicemonitor
Revert "4 x Revert "Enable new ServiceMonitor""
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 7aec27a96f5..9330dae2e41 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -43,7 +43,7 @@ <preprocess:include file='config-models.xml' required='false' /> <preprocess:include file='node-repository.xml' required='false' /> <preprocess:include file='hosted-vespa/routing-status.xml' required='false' /> - <component id="com.yahoo.vespa.service.monitor.ServiceMonitorImpl" bundle="orchestrator" /> + <component id="com.yahoo.vespa.service.monitor.SlobrokAndConfigIntersector" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.ServiceMonitorInstanceLookupService" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.status.ZookeeperStatusService" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.controller.RetryingClusterControllerClientFactory" bundle="orchestrator" /> |