diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-06-01 11:31:13 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-06-01 11:31:13 +0200 |
| commit | cd6e2dd7ab638487c462c40293a0d8db43fdb530 (patch) | |
| tree | edf9cec58f4a0e995fd713089779ec5d0a14d134 /controller-api | |
| parent | f7d0fe5fdfad579e867f01acc1d41b2ec77bd785 (diff) | |
| parent | 5c57852b26126d72b080fb6e0893dc3d633c28c1 (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 | 3 |
1 files changed, 0 insertions, 3 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 a2b420c8090..b15acd726d7 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 @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.configserver; -import com.fasterxml.jackson.databind.JsonNode; import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; @@ -38,8 +37,6 @@ public interface ConfigServer { void deactivate(DeploymentId applicationInstance) throws NoInstanceException; - JsonNode waitForConfigConverge(DeploymentId applicationInstance, long timeoutInSeconds); - ApplicationView getApplicationView(String tenantName, String applicationName, String instanceName, String environment, String region); Map<?,?> getServiceApiResponse(String tenantName, String applicationName, String instanceName, String environment, String region, String serviceName, String restPath); |