Merge pull request kubernetes#4929 from thockin/docker_dash_r

Stop using Docker's -r flag
satnam6502 · Mar 2, 2015 · db907b8 · db907b8
2 parents f7e2550 + d46146d
commit db907b8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
@@ -2,5 +2,5 @@ DOCKER_OPTS=""
 {% if grains.docker_opts is defined and grains.docker_opts %}
 DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
 {% endif %}
-DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"
+DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false"
 DOCKER_NOFILE=1000000