diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-23 20:42:58 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-10-23 20:42:58 +0200 |
| commit | 098f7fd34dfb3cdbb7f05c0bfe635c2f39cea2b3 (patch) | |
| tree | 1bd87252dfb71c39e1dc448349a22579eefe06f2 /controller-api | |
| parent | e678ffc025674df331f478064542db22fd7e4dd5 (diff) | |
| parent | 1a8bbf7434e13271f10862aa3c0057f30122ad0c (diff) | |
Merge with master
Diffstat (limited to 'controller-api')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java index 7deb7712b28..15ee3724b6c 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java @@ -27,11 +27,6 @@ public interface ConfigServer { PrepareResponse prepareResponse(); } - // TODO: Deprecated, remove when implementations have been removed - default PreparedApplication prepare(DeploymentId deployment, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content) { - return deploy(deployment, deployOptions, rotationCnames, rotationNames, content); - } - PreparedApplication deploy(DeploymentId deployment, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content); void restart(DeploymentId deployment, Optional<Hostname> hostname) throws NoInstanceException; |