diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-01-25 15:14:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 15:14:09 +0100 |
| commit | 888dcfc48fcebb73cf45a3c4763473eedb0490fc (patch) | |
| tree | 95f74cf65f2bdb11ed2fe6c7abb1dbcdf8ed6ceb /controller-server | |
| parent | e52902d0779af6d7a3d5c6929432ed4fc092d909 (diff) | |
| parent | 67926d3509aaff8bb7a03b732c29a9fe5c7d03fd (diff) | |
Merge pull request #8225 from vespa-engine/bratseth/nonfunctional-changes-only
Nonfunctional changes only
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java index 3aa61fe8370..4f1f7d4b277 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java @@ -70,7 +70,6 @@ public class Upgrader extends Maintainer { cancelUpgradesOf(applications().with(UpgradePolicy.conservative).upgrading().failing().notUpgradingTo(conservativeTarget), reason); // Schedule the right upgrades - canaryTarget.ifPresent(target -> upgrade(applications().with(UpgradePolicy.canary), target)); defaultTarget.ifPresent(target -> upgrade(applications().with(UpgradePolicy.defaultPolicy), target)); conservativeTarget.ifPresent(target -> upgrade(applications().with(UpgradePolicy.conservative), target)); |