diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2018-01-03 17:25:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 17:25:44 +0100 |
| commit | 53ddb245d451ada4d9ce9d5e137cf83825009526 (patch) | |
| tree | 00d9080cb6204089bd1da86fe2c036929bd9d1e1 /controller-server/src/main | |
| parent | 913d2c25a6ffde9ed1f838cdd6c647ed7d56b964 (diff) | |
| parent | 678a5f96e0d8e9c9024d78513a3e48f78fd6ef59 (diff) | |
Merge pull request #4548 from vespa-engine/musum/fix-zone-bug
Fix bug when creating zone id
Diffstat (limited to 'controller-server/src/main')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index 937c93a2f5c..7d06bbde081 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -250,7 +250,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor { new AthenzIdentityVerifier( singleton( zoneRegistry.getConfigserverAthenzService( - ZoneId.from(proxyRequest.getEnvironment(), proxyRequest.getEnvironment())))); + ZoneId.from(proxyRequest.getEnvironment(), proxyRequest.getRegion())))); return HttpClientBuilder.create() .setUserAgent("config-server-client") .setSslcontext(sslContextProvider.get()) |