aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-10-31 13:54:16 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-10-31 13:54:16 +0100
commit0655e947b38898c54a840287943a0b1612e79d0a (patch)
tree50041e692a558b077e672966d17e90f20a30d748 /controller-server
parentbe65022827e91bcc71df7adbb44c3a7c0458231a (diff)
Formatting
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 0409e2ec5ef..43ac3ba085f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -367,14 +367,14 @@ public class DeploymentTrigger {
private boolean isSuspendedInAnotherZone(Application application, ZoneId zone) {
for (Deployment deployment : application.productionDeployments().values()) {
- if ( ! deployment.zone().equals(zone)
- && controller.applications().isSuspended(new DeploymentId(application.id(), deployment.zone())))
+ if ( ! deployment.zone().equals(zone)
+ && controller.applications().isSuspended(new DeploymentId(application.id(), deployment.zone())))
return true;
}
return false;
}
- /** Returns whether job can trigger at given instant */
+ /** Returns whether the given job can trigger at the given instant */
public boolean triggerAt(Instant instant, JobType job, Versions versions, Application application) {
Optional<JobStatus> jobStatus = application.deploymentJobs().statusOf(job);
if (!jobStatus.isPresent()) return true;