diff options
| author | Jon Bratseth <bratseth@oath.com> | 2022-01-07 10:54:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 10:54:48 +0100 |
| commit | ea8199921bb9b46e86ef7f2c715c2e00b0708ade (patch) | |
| tree | b4178b23227abe63dd14ae75310a8e7f07ed608d /config-model | |
| parent | 7f0beb86fe8a571575aa220ce3dfd0061de9ece2 (diff) | |
| parent | 2d80f10452966e85dafa3480a4b1c7c4e97ca55d (diff) | |
Merge pull request #20680 from vespa-engine/arnej/add-legacy-overrides
Arnej/add legacy overrides
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java | 4 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/services.rnc | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java index 4591578d7e5..8d192414871 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java @@ -133,6 +133,10 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter for (Element servicesElement : children) { String tagName = servicesElement.getTagName(); + if (tagName.equals("legacy")) { + // for enabling legacy features from old vespa versions + continue; + } if (tagName.equals("config")) { // TODO: disallow on Vespa 8 continue; diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index 758fa107ee8..c8467898639 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -12,6 +12,7 @@ include "legacygenericcluster.rnc" start = element services { attribute version { "1.0" }? & attribute application-type { "hosted-infrastructure" }? & + element legacy { element v7-geo-positions { xsd:boolean } }? & LegacyGenericCluster* & GenericCluster* & GenericConfig* & |