diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-10-09 16:00:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 16:00:55 +0200 |
| commit | 9f31611891a8dfef8086f6184e042ec04363e340 (patch) | |
| tree | f1ea8ce63be1ec46fd8f30fc6808c1b71c6638f6 /config-model | |
| parent | fe8b4bfa8929ed37d4318ae0c42a96533811af42 (diff) | |
| parent | 54091f63a33a888358e37c2ecfe99a0d05f20326 (diff) | |
Merge pull request #3687 from vespa-engine/bratseth/block-revision-changes
Support blocking application changes
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 4 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/deployment.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 16cc3acfafa..03331807d15 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -17,8 +17,8 @@ Upgrade = element upgrade { } BlockChange = element block-change { - attribute revisions { xsd:boolean }? & - attribute versions { xsd:boolean }? & + attribute revision { xsd:boolean }? & + attribute version { xsd:boolean }? & attribute days { xsd:string } & attribute hours { xsd:string } & attribute time-zone { xsd:string }? diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index 2fd6d7c3ec8..1b2a61e1a7a 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -1,7 +1,7 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <deployment version='1.0'> <upgrade policy='canary'/> - <block-change revisions='true' versions='false' days="mon,tue" hours="14,15"/> + <block-change revision='true' version='false' days="mon,tue" hours="14,15"/> <block-change days="mon,tue" hours="14,15" time-zone="CET"/> <test/> <staging/> |