aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-02-22 14:03:56 +0100
committerGitHub <noreply@github.com>2018-02-22 14:03:56 +0100
commit73f40a186b506f1ded4cdd0963e86700f88dab5d (patch)
tree0726070e8e3ada3e2160f85eb6a661cc4965a218
parent89ee93f4a1e98b199e68d7d0c6533116073f5ea6 (diff)
parente71ffbf41c9c22f68147d7669527eab61f1397ec (diff)
Merge pull request #5117 from vespa-engine/mortent/add-config-server-components-file
Include file configserver-components.xml
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index bf38eedc97f..a2ef382a5a7 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -181,5 +181,7 @@
<preprocess:include file='athenz-identity-provider.xml' required='false' />
<preprocess:include file='configserver-config.xml' required='false' />
+
+ <preprocess:include file='configserver-components.xml' required='false' />
</jdisc>
</services>