Merge pull request #4929 from thockin/docker_dash_r

Stop using Docker's -r flag

Merge pull request #4929 from thockin/docker_dash_r
db907b85 · Rohit Jnagal · f7e25505 · d46146da · db907b85
Commit db907b85 authored Mar 02, 2015 by Rohit Jnagal
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docker-defaults cluster/saltbase/salt/docker/docker-defaults +1 -1

No files found.
--- 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