Merge pull request #819 from thockin/restarts

Disable docker restarts, for now

Merge pull request #819 from thockin/restarts
4123a446 · Clayton Coleman · b43e3865 · 92f13ceb · 4123a446
Commit 4123a446 authored Aug 07, 2014 by Clayton Coleman
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
-DOCKER_OPTS="--bridge cbr0 --iptables=false"
+DOCKER_OPTS="--bridge cbr0 --iptables=false -r=false"