diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-04-02 15:03:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 15:03:27 +0200 |
| commit | 6ad65a6ce0b7e56cde45a61db3dfb6314d9e8caf (patch) | |
| tree | 86741360c720367644dac01b70985267b5c3c8d8 /config-model/src/main | |
| parent | 67f18277a9d68bb35bca00e25b38378495bcdd6a (diff) | |
| parent | 79d41d1d168220c47d1056a7d1db6828602314a5 (diff) | |
Merge pull request #8977 from vespa-engine/bratseth/allow-destructive-changes-in-dev
Allow destructive changes in manually deployed zones
Diffstat (limited to 'config-model/src/main')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 910eff065d1..7a981cd6a53 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -121,7 +121,12 @@ public class DeployState implements ConfigDefinitionStore { this.importedModels = new ImportedMlModels(applicationPackage.getFileReference(ApplicationPackage.MODELS_DIR), modelImporters); - this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty); + this.validationOverrides = + zone.environment().isManuallyDeployed() + ? ValidationOverrides.all // Don't protect manually deployed zones + : applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml) + .orElse(ValidationOverrides.empty); + this.wantedNodeVespaVersion = wantedNodeVespaVersion; this.now = now; } |