Merge branch 'master' of github.com:vespa-engine/vespa into hakonhall/correct-to-currentrestartgeneration

1 files changed, 2 insertions, 2 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 f7caa0c734c..62828b314d0 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
@@ -141,8 +141,8 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.dockerVespaBaseImage().isPresent()) {
             builder.dockerVespaBaseImage(options.dockerVespaBaseImage().get());
         }
-        if (options.serviceProviderEndpoint().isPresent()) {
-            builder.serviceProviderEndpoint(options.serviceProviderEndpoint().get());
+        if (options.loadBalancerAddress().isPresent()) {
+            builder.loadBalancerAddress(options.loadBalancerAddress().get());
         }
     }