summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-11-04 17:48:53 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-11-04 17:48:53 +0100
commit8642c50977855bc95d24f88742427fbf97a8c163 (patch)
treef116fc18655c0cd2bcde1dc7df31a1d36d1fb967
parent9f8a715030cb77bcb3cbe4f9926a3c73bb614047 (diff)
Else
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index 211e09a56b9..fa5d713d6b3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -243,7 +243,7 @@ class JobControllerApiHandlerHelper {
Cursor pendingObject = runObject.setObject("tasks");
if (application.deploymentJobs().statusOf(type).map(status -> status.pausedUntil().isPresent()).orElse(false))
pendingObject.setString("paused", "pending");
- if ( ! controller.applications().deploymentTrigger().triggerAt(controller.clock().instant(), type, versions, application))
+ else if ( ! controller.applications().deploymentTrigger().triggerAt(controller.clock().instant(), type, versions, application))
pendingObject.setString("cooldown", "failed");
else {
int pending = 0;