diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-09-05 08:55:25 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-09-05 11:22:10 +0200 |
commit | e58037f289cba5c58c81be096351ae1bc24dbaa6 (patch) | |
tree | 86b0fb84d26c197aa4ea0147f428a1127bb968a1 | |
parent | 32c28225e83518232a211cc7de0d538edec7072e (diff) |
Stop auto-upgrading dev and perf deployments
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 8e59b52777d..c3650b930a4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -304,12 +304,8 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye LocalSession newSession = tenant.getSessionFactory().createSessionFromExisting(activeSession, logger, true, timeoutBudget); tenant.getLocalSessionRepo().addSession(newSession); - // Keep manually deployed tenant applications on the latest version, don't change version otherwise - // TODO: Remove this and always use version from session once controller starts upgrading manual deployments - Version version = decideVersion(application, zone().environment(), newSession.getVespaVersion(), bootstrap); - return Optional.of(Deployment.unprepared(newSession, this, hostProvisioner, tenant, timeout, clock, - false /* don't validate as this is already deployed */, version, + false /* don't validate as this is already deployed */, newSession.getVespaVersion(), bootstrap)); } |