summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2024-04-15 16:19:26 +0200
committerGitHub <noreply@github.com>2024-04-15 16:19:26 +0200
commit77d0b6e7f665bb02157e93108dd64aa7a169ed20 (patch)
tree82f3fe695706c3946283ffad57d44cf2693600f8
parentfd59b1b4f4edaf4699a39b73b15e6b837bf091af (diff)
parent02bedb5c31a9d95e0287e11ddc90cc442e1ec57a (diff)
Merge pull request #30896 from vespa-engine/hakonhall/environment-is-resolved-eagerly
Environment is resolved eagerly
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Dimension.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java b/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java
index 328d581aed3..b02fa949dbb 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java
@@ -44,8 +44,8 @@ public enum Dimension {
/**
* Cloud from com.yahoo.config.provision.CloudName::value, e.g. yahoo, aws, gcp.
*
- * <p><em>Eager resolution</em>: This dimension is resolved before putting the flag data to the config server
- * or controller, unless controller and the flag has declared this dimension.
+ * <p><em>Eager resolution</em>: This dimension is resolved before storing the flag data in the config server and
+ * controller ZooKeeper, UNLESS it is the controller and the flag was defined with this dimension in [Permanent]Flags.
*/
CLOUD("cloud"),
@@ -61,7 +61,10 @@ public enum Dimension {
/** Email address of user - provided by auth0 in console. */
CONSOLE_USER_EMAIL("console-user-email"),
- /** Hosted Vespa environment from com.yahoo.config.provision.Environment::value, e.g. prod, staging, test. */
+ /**
+ * Hosted Vespa environment from com.yahoo.config.provision.Environment::value, e.g. prod, staging, test.
+ * <em>Eager resolution</em>, see {@link #CLOUD}.
+ */
ENVIRONMENT("environment"),
/**