summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-01-09 14:55:35 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-01-09 14:55:35 +0100
commitbc9d0b4dd9cbf9e925397fe42adae84df23e828a (patch)
treecf8bb8f6535cd53d25b48574e8f2bd2449d772b5
parenta9c77576da201d3da009e8f86800d23070284a41 (diff)
Allow unpinning when change is otherwise empty
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java2
1 files changed, 1 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 c8104c6e2b0..f727baf0b8f 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
@@ -803,7 +803,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
StringBuilder response = new StringBuilder();
controller.applications().lockOrThrow(id, application -> {
Change change = application.get().change();
- if ( ! change.isPresent()) {
+ if ( ! change.isPresent() && ! change.isPinned()) {
response.append("No deployment in progress for " + application + " at this time");
return;
}