summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-05-21 09:07:17 +0200
committerGitHub <noreply@github.com>2020-05-21 09:07:17 +0200
commit1ca40f19299c6c96273415472f8a9ac3a0d02c28 (patch)
treef393f48b261138fb61c1a00e621c0dcacedcc3b7
parentcb353bf1f6cff073d140d36278bbadeec81cc2fd (diff)
parentc14b736e087707022701d84afd796655295436c8 (diff)
Merge pull request #13339 from vespa-engine/hmusum/rename-flag-id
Rename flag id to avoid collision with one that still has is unues
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java2
1 files changed, 1 insertions, 1 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 416b6f59345..04797565344 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -180,7 +180,7 @@ public class Flags {
HOSTNAME);
public static final UnboundStringFlag ZOOKEEPER_SERVER_VERSION = defineStringFlag(
- "zookeeper-server-version", "3.5.6",
+ "zookeeper-server-version-full", "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);