diff options
| author | Harald Musum <musum@oath.com> | 2018-09-11 11:44:24 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:21 +0100 |
| commit | 8ae00d16e7f8d6e771a0155140e4acb566145e2e (patch) | |
| tree | e9b239af4e9360e562f83c8ac686979d670e9263 /config-model | |
| parent | 28f6f04b313b330e945ca6d4bfeef1f598df7442 (diff) | |
Remove support for block-upgrade element in deployment.xml
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 7 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/deployment.xml | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 4fc34862365..b2c3dcf7b5a 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -12,7 +12,6 @@ start = element deployment { Notifications? & Test? & Staging? & - BlockUpgrade* & Prod* } @@ -28,12 +27,6 @@ BlockChange = element block-change { attribute time-zone { xsd:string }? } -BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7 - attribute days { xsd:string } & - attribute hours { xsd:string } & - attribute time-zone { xsd:string }? -} - Notifications = element notifications { attribute when { xsd:string }? & Email* diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index 15f8c969f04..ea65dbec661 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -5,7 +5,6 @@ <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' athenz-service='other-service'> <region active='true'>us-west-1</region> <delay hours='3'/> |