diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-05-20 12:18:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 12:18:58 +0200 |
| commit | 09556b0ee220c786271509833f2dc7e19fe9852e (patch) | |
| tree | c8eb7ee2c89fcc93d03131a271878a50255824cd /flags | |
| parent | a721283dd69afc346d2138bcec4e6aef2d66fd03 (diff) | |
| parent | 034146bc6de7babdeecae443480f11cba4c3461b (diff) | |
Merge branch 'master' into balder/topk-probability-four-nines
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index d2e85a1dae3..61205911848 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -109,12 +109,6 @@ public class Flags { "Takes effect on restart of Docker container", NODE_TYPE, APPLICATION_ID, HOSTNAME); - public static final UnboundBooleanFlag USE_ADAPTIVE_DISPATCH = defineFeatureFlag( - "use-adaptive-dispatch", false, - "Should adaptive dispatch be used over round robin", - "Takes effect at redeployment", - ZONE_ID, APPLICATION_ID); - public static final UnboundIntFlag REBOOT_INTERVAL_IN_DAYS = defineIntFlag( "reboot-interval-in-days", 30, "No reboots are scheduled 0x-1x reboot intervals after the previous reboot, while reboot is " + @@ -180,9 +174,9 @@ public class Flags { "Takes effect on next host-admin tick.", HOSTNAME); - public static final UnboundStringFlag ZOOKEEPER_SERVER_MAJOR_MINOR_VERSION = defineStringFlag( - "zookeeper-server-version", "3.5", - "The version of ZooKeeper server to use (major.minor, not full version)", + public static final UnboundStringFlag ZOOKEEPER_SERVER_VERSION = defineStringFlag( + "zookeeper-server-version", "3.5.6", + "ZooKeeper server version, a jar file zookeeper-server-<ZOOKEEPER_SERVER_VERSION>-jar-with-dependencies.jar must exist", "Takes effect on restart of Docker container", NODE_TYPE, APPLICATION_ID, HOSTNAME); |