diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-01 12:52:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-01 12:52:59 +0200 |
commit | 318fc77cf4d4bab4c4a7dd134c92edc77964e37d (patch) | |
tree | aa495412e3e158120410524d04b9fae3e4e95d82 /config-model | |
parent | b3cff606d0314b6815a7800f263aa47aad99d5f4 (diff) |
Revert "Return 409 with error code TRANSIENT_ERROR when getting TransientExce…"
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index c48a277b4fb..ca5c188ddb1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -20,7 +20,7 @@ import com.yahoo.config.model.api.ValidationParameters; import com.yahoo.config.model.application.provider.ApplicationPackageXmlFilesValidator; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.provision.exception.TransientException; +import com.yahoo.config.provision.TransientException; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.config.VespaVersion; import com.yahoo.vespa.model.application.validation.Validation; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidator.java index 329f2d16d0a..1018099cf05 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidator.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.application.validation; import com.yahoo.config.model.api.TlsSecrets; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.provision.exception.CertificateNotReadyException; +import com.yahoo.config.provision.CertificateNotReadyException; import com.yahoo.vespa.model.VespaModel; public class TlsSecretsValidator extends Validator { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidatorTest.java index 85f865c21f3..cdb4ce955e2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/TlsSecretsValidatorTest.java @@ -7,7 +7,7 @@ import com.yahoo.config.model.api.TlsSecrets; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; -import com.yahoo.config.provision.exception.CertificateNotReadyException; +import com.yahoo.config.provision.CertificateNotReadyException; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; |