aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2017-11-21 14:14:23 +0100
committerGitHub <noreply@github.com>2017-11-21 14:14:23 +0100
commit3925924678c77c42c208c9b508ae72917df96300 (patch)
tree10dc724be1e25283b66b9b96c0371b14b745a3f1 /controller-api
parent5c30536ceafbeb1b4ab22dd730da841efd15495e (diff)
parent14ed128972d79fc11fa6647c37131e7145be2870 (diff)
Merge branch 'master' into jvenstad/application-locking-revised
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java1
1 files changed, 1 insertions, 0 deletions
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 e7bdf786c8c..df6f023f6af 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
@@ -25,6 +25,7 @@ public interface ZoneRegistry {
List<URI> getConfigServerUris(Environment environment, RegionName region);
Optional<URI> getLogServerUri(Environment environment, RegionName region);
Optional<Duration> getDeploymentTimeToLive(Environment environment, RegionName region);
+ Optional<RegionName> getDefaultRegion(Environment environment);
URI getMonitoringSystemUri(Environment environment, RegionName name, ApplicationId application);
URI getDashboardUri();