diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-03-18 08:11:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 08:11:18 +0000 |
| commit | e52b3ab39a5ae05fc1b1d538b6efa852f321a2f2 (patch) | |
| tree | 7aa2e56ff3099c1986f64438dc0fa2fe602cfc17 | |
| parent | bc2ae472494d95d35f7ca8720c0c94dcaca07a1a (diff) | |
| parent | 29f27a1cd193dbb1385c08957a1b2f7b3ad6d1e9 (diff) | |
Merge pull request #8800 from vespa-engine/kkraune/default-no-logserver-uri
Kkraune/default no logserver uri
2 files changed, 1 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java index 391aaa4639e..ebcebd994d1 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java @@ -18,7 +18,6 @@ import java.util.List; public class InstanceInformation { public List<URI> serviceUrls; public URI nodes; - public URI elkUrl; public URI yamasUrl; public RevisionId revision; public Long deployTimeEpochMs; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java index d9d4408caac..b7303480701 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java @@ -41,7 +41,7 @@ public interface ZoneRegistry { List<URI> getConfigServerApiUris(ZoneId zoneId); /** Returns a URL with the logs for the given deployment, if logging is configured for its zone */ - Optional<URI> getLogServerUri(DeploymentId deploymentId); + default Optional<URI> getLogServerUri(DeploymentId deploymentId) { return Optional.empty(); }; /** Returns the time to live for deployments in the given zone, or empty if this is infinite */ Optional<Duration> getDeploymentTimeToLive(ZoneId zoneId); |