diff options
| author | olaaun <ola.aunroe@gmail.com> | 2018-10-16 12:32:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 12:32:51 +0200 |
| commit | 13c06dda80a8229991ddab2b8579baefb5f08f65 (patch) | |
| tree | 377f8f82f6ecff7e8bad55ffa3645bec90cd85a5 /controller-server/src/main/resources | |
| parent | 2cc64e617ff11f763d9fa165b37d19df0ced4114 (diff) | |
Revert 7315 revert 7274 olaaun/contact info maintainer feed to api (#7320)
* Revert "Revert "ContactInformationMaintainer now feeds to ContactInfoAPI instead of d… (#7274)" (#7315)"
This reverts commit 0a9e36c185cf555dd851b065c16ef720665dd906.
* Changed authorities config from string to list. Shortened namespace.
Diffstat (limited to 'controller-server/src/main/resources')
| -rw-r--r-- | controller-server/src/main/resources/configdefinitions/api-authority.def | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/controller-server/src/main/resources/configdefinitions/api-authority.def b/controller-server/src/main/resources/configdefinitions/api-authority.def new file mode 100644 index 00000000000..9ab652ecc81 --- /dev/null +++ b/controller-server/src/main/resources/configdefinitions/api-authority.def @@ -0,0 +1,4 @@ +# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.hosted.controller.authority.config + +authorities[] string
\ No newline at end of file |