diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-11 13:45:17 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-11 13:45:17 +0200 |
| commit | 9549a8005480a3fe61fb087e359a4a442180819f (patch) | |
| tree | e76ded2ddf9a8127cd780304105313c22640c8dc /configserver/src/test/resources | |
| parent | 9f3a3b9f6962bd20714b99a046860de1886be600 (diff) | |
| parent | 1c79079945c56fa91de8427fbc8f2170eec9ed8c (diff) | |
Merge remote-tracking branch 'origin/master' into olaa/cfg-server-metric-aggregation
Conflicts:
configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
Diffstat (limited to 'configserver/src/test/resources')
3 files changed, 15 insertions, 2 deletions
diff --git a/configserver/src/test/resources/deploy/advancedapp/services.xml b/configserver/src/test/resources/deploy/advancedapp/services.xml index e9b301bea52..e3d5aea585b 100644 --- a/configserver/src/test/resources/deploy/advancedapp/services.xml +++ b/configserver/src/test/resources/deploy/advancedapp/services.xml @@ -10,12 +10,12 @@ </slobroks> </admin> - <jdisc version="1.0"> + <container version="1.0"> <search /> <nodes> <node hostalias="node1" baseport='8000'/> </nodes> - </jdisc> + </container> <content version="1.0"> <redundancy>1</redundancy> diff --git a/configserver/src/test/resources/deploy/hosted-app/deployment.xml b/configserver/src/test/resources/deploy/hosted-app/deployment.xml new file mode 100644 index 00000000000..a92404c161d --- /dev/null +++ b/configserver/src/test/resources/deploy/hosted-app/deployment.xml @@ -0,0 +1,7 @@ +<!-- Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<deployment version='1.0'> + <prod global-service-id="qrs"> + <region active="true">us-north-1</region> + <region active="true">us-north-2</region> + </prod> +</deployment> diff --git a/configserver/src/test/resources/deploy/hosted-app/services.xml b/configserver/src/test/resources/deploy/hosted-app/services.xml new file mode 100644 index 00000000000..57bee6ce9c9 --- /dev/null +++ b/configserver/src/test/resources/deploy/hosted-app/services.xml @@ -0,0 +1,6 @@ +<!-- Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<services version="1.0"> + <container id="qrs" version="1.0"> + <nodes count="2"/> + </container> +</services> |