diff options
| author | Arne H Juul <arnej@yahooinc.com> | 2022-01-03 13:05:08 +0000 |
|---|---|---|
| committer | Arne H Juul <arnej@yahooinc.com> | 2022-01-03 13:05:08 +0000 |
| commit | ef67e176184d8d2261d9f6de788897c37fea0294 (patch) | |
| tree | ac87d6d673b92b44a7dd19eaf322b1e72c38ed64 /config-model-api | |
| parent | 2ff775ff41d2d759c62f7423a34c795c3ea2a504 (diff) | |
| parent | 1f3e5d1003a33d9a7076575eab8059c582611cdb (diff) | |
Merge branch 'master' into arnej/feature-flag-for-user-agents
Conflicts:
config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 77bf2ea759a..a0dba36fef5 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -114,6 +114,7 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"hmusum"}) default boolean failDeploymentWithInvalidJvmOptions() { return false; } @ModelFeatureFlag(owners = {"baldersheim"}) default double tlsSizeFraction() { throw new UnsupportedOperationException("TODO specify default value"); } @ModelFeatureFlag(owners = {"arnej", "andreer"}) default List<String> ignoredHttpUserAgents() { return List.of(); } + @ModelFeatureFlag(owners = {"bjorncs"}) default boolean enableServerOcspStapling() { return false; } } /** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */ |