diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2017-10-23 13:18:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 13:18:50 +0200 |
| commit | 79c1773d3353863451e0d75243e280c40b6658b0 (patch) | |
| tree | e9c83538e92b63afabc418003cbccc754f21ba9d /configserver | |
| parent | 7f93a3bd50c534c92d3d7b37a4a5a47e512ff0d7 (diff) | |
| parent | 0cf7be3cc88be1211c48cfb520e0c13920639c0b (diff) | |
Merge pull request #3830 from vespa-engine/bjorncs/athenz-identity-provider-service
Initial Athenz copper argos implementation
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
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 7aec27a96f5..db95cb17530 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -134,5 +134,7 @@ <server port="19071" id="configserver" /> <preprocess:include file='hosted-vespa/http-server.xml' required='false' /> </http> + + <preprocess:include file='athenz-identity-provider.xml' required='false' /> </jdisc> </services> |