aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-12-14 12:32:20 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-12-14 12:32:20 +0100
commitd03e68697a77eff2302726f8f6ff449d3577cde6 (patch)
tree6e8aef7e09821e5376f2588d616f7e208b31fa3b /controller-server
parent87106d072ffce92102d6085214b9c235c662689e (diff)
Change response from application api as well — it's the go-forward
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index d90f565b90e..3eb6b214b52 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -364,7 +364,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
String triggered = controller.applications().deploymentTrigger()
.forceTrigger(id, type, request.getJDiscRequest().getUserPrincipal().getName())
.stream().map(JobType::jobName).collect(joining(", "));
- return new MessageResponse("Triggered " + triggered + " for " + id);
+ return new MessageResponse(triggered.isEmpty() ? "Job " + type.jobName() + " for " + id + " not triggered"
+ : "Triggered " + triggered + " for " + id);
}
private HttpResponse pause(ApplicationId id, JobType type) {