summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2019-06-16 18:43:03 +0200
committerGitHub <noreply@github.com>2019-06-16 18:43:03 +0200
commitc8d676ace605d9003f260a8c66457259ad99958b (patch)
treead678597f54d721343892e19eb850522475c19f5 /controller-api
parentc42b06f4843c55233197bc0eafe3426f6f5d7f3a (diff)
parent0c1d41ed78ff6c1135d823b3b24b6eb8f63a5a5b (diff)
Merge pull request #9823 from vespa-engine/hakonhall/remove-system-from-zoneid
Remove system from ZoneId
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
index 94e111455ac..a1beef23dbb 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
@@ -154,7 +154,7 @@ public enum JobType {
case test: return Optional.of(systemTest);
case staging: return Optional.of(stagingTest);
}
- return from(system, ZoneId.from(system, environment, region));
+ return from(system, ZoneId.from(environment, region));
}
}