Merge branch 'master' into balder/only-allow-legal-inheritance

1 files changed, 3 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 4127eca1980..9a736fc6d01 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -185,6 +185,7 @@ public class ModelContextImpl implements ModelContext {
         private final double minNodeRatioPerGroup;
         private final int metricsproxyNumThreads;
         private final boolean enforceRankProfileInheritance;
+        private final boolean newLocationBrokerLogic;
 
         public FeatureFlags(FlagSource source, ApplicationId appId) {
             this.defaultTermwiseLimit = flagValue(source, appId, Flags.DEFAULT_TERM_WISE_LIMIT);
@@ -215,6 +216,7 @@ public class ModelContextImpl implements ModelContext {
             this.minNodeRatioPerGroup = flagValue(source, appId, Flags.MIN_NODE_RATIO_PER_GROUP);
             this.metricsproxyNumThreads = flagValue(source, appId, Flags.METRICSPROXY_NUM_THREADS);
             this.enforceRankProfileInheritance = flagValue(source, appId, Flags.ENFORCE_RANK_PROFILE_INHERITANCE);
+            this.newLocationBrokerLogic = flagValue(source, appId, Flags.NEW_LOCATION_BROKER_LOGIC);
         }
 
         @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
@@ -246,6 +248,7 @@ public class ModelContextImpl implements ModelContext {
         @Override public double resourceLimitMemory() { return resourceLimitMemory; }
         @Override public double minNodeRatioPerGroup() { return minNodeRatioPerGroup; }
         @Override public int metricsproxyNumThreads() { return metricsproxyNumThreads; }
+        @Override public boolean newLocationBrokerLogic() { return newLocationBrokerLogic; }
 
         @Override public boolean enforceRankProfileInheritance() { return enforceRankProfileInheritance; }