summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-05-28 10:34:22 +0200
committerHarald Musum <musum@verizonmedia.com>2019-05-28 10:34:22 +0200
commit9ec45b99b6cec8e879d7701654a25001f26f3f9e (patch)
tree57b490145c20f36370ae19bae328fd4cb673ed20 /configserver
parentda58e8e064f7fcbac13836a617100dac2504d607 (diff)
Use new path to controller xml files
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index c93970a5fbb..1a0efc59b16 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -57,7 +57,7 @@
<component id="com.yahoo.vespa.configserver.flags.db.FlagsDbImpl" bundle="configserver-flags"/>
<preprocess:include file='metrics-packets.xml' required='false' />
- <preprocess:include file='controller/container.xml' required='false' />
+ <preprocess:include file='container.xml' required='false' />
<component id="com.yahoo.vespa.service.slobrok.SlobrokMonitorManagerImpl" bundle="service-monitor" />
<component id="com.yahoo.vespa.service.health.HealthMonitorManager" bundle="service-monitor" />
<component id="com.yahoo.vespa.service.manager.UnionMonitorManager" bundle="service-monitor" />
@@ -156,7 +156,7 @@
<http>
<server port="19071" id="configserver" />
<preprocess:include file='http-server.xml' required='false' />
- <preprocess:include file='controller/http.xml' required='false' />
+ <preprocess:include file='http.xml' required='false' />
</http>
<preprocess:include file='athenz-identity-provider.xml' required='false' />