diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-10-16 15:28:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 15:28:19 +0200 |
| commit | 4b5586052159e2db045c8aa38abfd720aede7ab4 (patch) | |
| tree | 2c82b07045dc4121265ba480b02da952f76603b7 /config-model | |
| parent | c2dc8ed1c225159094c71c6b4ba66de78d9bf7fe (diff) | |
| parent | 5b08886871690ba8bcff448107db9a6a51ce3132 (diff) | |
Merge pull request #3769 from vespa-engine/mpolden/fix-block-upgrade
Let block-upgrade continue to work
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 | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 9a5eb46590c..90bff8e31b3 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -25,7 +25,9 @@ BlockChange = element block-change { } BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7 - BlockChange + attribute days { xsd:string } & + attribute hours { xsd:string } & + attribute time-zone { xsd:string }? } Test = element test { diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index 0b47903ae39..f469d22b6f0 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -5,6 +5,7 @@ <staging/> <block-change revision='true' version='false' days="mon,tue" hours="14,15"/> <block-change days="mon,tue" hours="14,15" time-zone="CET"/> + <block-upgrade days="wed" hours="16" time-zone="CET"/><!-- Tests legacy name. Remove in Vespa 7 --> <prod global-service-id='qrs'> <region active='true'>us-west-1</region> <delay hours='3'/> |