summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-04-17 14:53:34 +0200
committerHarald Musum <musum@oath.com>2018-04-17 14:53:34 +0200
commit5b43b00e1cd49029f10543a14a8dd022f739a832 (patch)
treeefd3c3af98c9235b0c4d1dcfe711c01c5a5c356c /controller-api
parentb9f6244b3cf0830ad423b41732e0279285bce7b8 (diff)
Remove logic for choosing between deploy and prepare-activate
Logic has been moved to config server client
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java
index afed92cf732..da3e32df5c9 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java
@@ -27,7 +27,10 @@ public interface ConfigServerClient {
PrepareResponse prepareResponse();
}
- PreparedApplication prepare(DeploymentId applicationInstance, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content);
+ // TODO: Deprecated, remove when implementations have been removed
+ default PreparedApplication prepare(DeploymentId applicationInstance, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content) {
+ return deploy(applicationInstance, deployOptions, rotationCnames, rotationNames, content);
+ }
PreparedApplication deploy(DeploymentId applicationInstance, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content);