summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2017-10-02 16:11:17 +0200
committerGitHub <noreply@github.com>2017-10-02 16:11:17 +0200
commit0d036e88a56425e816b7cbc0b8b3c80094915e51 (patch)
tree28b4e7cf272a28bc8b8477b1fd5dd7a9116927ad
parentff4cfda3e045d146331de13c386e2b96ea7d958a (diff)
parent005c12a3c5a020243be0af1fbf3354734733bc43 (diff)
Merge pull request #3617 from vespa-engine/revert-3607-hakon/enable-new-servicemonitor
Revert "Enable new ServiceMonitor"
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml2
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" />