aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@verizonmedia.com>2022-03-15 22:07:50 +0100
committerGitHub <noreply@github.com>2022-03-15 22:07:50 +0100
commit6cf076486ffc704f3ceb0e4041d3e4c2dc0b3a96 (patch)
tree0b64f846aff4ec94eb9913fa7686d9a33289cc29
parentca88507ce370ed59f73e9ef776b59f4a5a575bf7 (diff)
parent4f4af65ce78a011896cd78bb26995873cf6a9546 (diff)
Merge pull request #21697 from vespa-engine/hmusum/do-not-use-cluster-type-for-flagv7.559.12
Do not use cluster type when getting flag
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java2
1 files changed, 1 insertions, 1 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 48106d702b9..1cfc7758def 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
@@ -261,7 +261,7 @@ public class ModelContextImpl implements ModelContext {
this.avoidRenamingSummaryFeatures = flagValue(source, appId, version, Flags.AVOID_RENAMING_SUMMARY_FEATURES);
this.mergeGroupingResultInSearchInvoker = flagValue(source, appId, version, Flags.MERGE_GROUPING_RESULT_IN_SEARCH_INVOKER);
this.experimentalSdParsing = flagValue(source, appId, version, Flags.EXPERIMENTAL_SD_PARSING);
- this.adminClusterNodeResourcesArchitecture = flagValue(source, appId, version, ClusterSpec.Type.admin, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE);
+ this.adminClusterNodeResourcesArchitecture = flagValue(source, appId, version, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE);
}
@Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }