diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-02-22 17:08:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-22 17:08:47 +0100 |
commit | d1e343ea538a0ca0f924564b0434837dff34d390 (patch) | |
tree | cac2ff69e45c72e02ac1e4708dd106bbc196dbc9 | |
parent | a2d1edf6a50faf4ec222105830acc9bd0bd67de5 (diff) | |
parent | dd61a3cf7ef612ae5db345ae9e9e24642efe2d04 (diff) |
Merge pull request #12309 from vespa-engine/hakonhall/default-to-docker-1131-102git7f2769b
Default to Docker 1.13.1-102.git7f2769b
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
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 fc54c61fca8..32a235f2989 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -74,7 +74,7 @@ public class Flags { HOSTNAME, NODE_TYPE); public static final UnboundStringFlag DOCKER_VERSION = defineStringFlag( - "docker-version", "1.13.1-91.git07f3374", + "docker-version", "1.13.1-102.git7f2769b", "The version of the docker to use of the format VERSION-REL: The YUM package to be installed will be " + "2:docker-VERSION-REL.el7.centos.x86_64 in AWS (and without '.centos' otherwise). " + "If docker-version is not of this format, it must be parseable by YumPackageName::fromString.", |