diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2016-11-16 14:57:32 +0000 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2016-11-16 14:57:32 +0000 |
commit | 6c70e293df84fdd12267704f03817b1c6bd335a4 (patch) | |
tree | a490678542953dee7a41b70d5e6f55ffdb4ff09c /config-model | |
parent | e6898f9c25547026a93b005477bea1177af4b563 (diff) |
region->system
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java index 1da0d886c1f..156b8c980de 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java @@ -48,7 +48,7 @@ public class ConfigserverCluster extends AbstractConfigProducer // so we need to propagate the zone options into the container from here Environment environment = options.environment().isPresent() ? Environment.from(options.environment().get()) : Environment.defaultEnvironment(); RegionName region = options.region().isPresent() ? RegionName.from(options.region().get()) : RegionName.defaultName(); - SystemName system = options.region().isPresent() ? SystemName.from(options.system().get()) : SystemName.defaultSystem(); + SystemName system = options.system().isPresent() ? SystemName.from(options.system().get()) : SystemName.defaultSystem(); containerCluster.setZone(new Zone(system, environment, region)); } |