diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-07-10 16:22:16 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-07-10 16:41:52 +0200 |
| commit | d61ecb2cb1340aa9e708678791c77226826066db (patch) | |
| tree | fb17bc7cb0201fc434cc69dced37067edad20be7 /config-model/src/test/cfg/container | |
| parent | 6a7d07037ce40a637441078afe6951c00d189e7b (diff) | |
Deprecate 'jdisc', and update all tests to use 'container.
Diffstat (limited to 'config-model/src/test/cfg/container')
3 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml index 47f25d86d58..9763dda556e 100644 --- a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml +++ b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml @@ -1,3 +1,3 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<jdisc> -</jdisc> +<container> +</container> diff --git a/config-model/src/test/cfg/container/data/configserverinclude/services.xml b/config-model/src/test/cfg/container/data/configserverinclude/services.xml index 73d924f762d..5691922ec7f 100644 --- a/config-model/src/test/cfg/container/data/configserverinclude/services.xml +++ b/config-model/src/test/cfg/container/data/configserverinclude/services.xml @@ -2,9 +2,9 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> - <jdisc id='configserver' version="1.0"> + <container id='configserver' version="1.0"> <http> <server id="configserver" port="1234" /> </http> - </jdisc> + </container> </services> diff --git a/config-model/src/test/cfg/container/data/include_xml_error/services.xml b/config-model/src/test/cfg/container/data/include_xml_error/services.xml index 4e703c7e40c..e6b749ce8c5 100644 --- a/config-model/src/test/cfg/container/data/include_xml_error/services.xml +++ b/config-model/src/test/cfg/container/data/include_xml_error/services.xml @@ -7,7 +7,7 @@ <logserver hostalias="node1" /> </admin> - <jdisc version="1.0"> + <container version="1.0"> <search> <include dir='dir1'/> </search> @@ -15,6 +15,6 @@ <nodes> <node hostalias="node1" /> </nodes> - </jdisc> + </container> </services> |