Skip to content

Commit

Permalink
Merge pull request kubernetes#819 from thockin/restarts
Browse files Browse the repository at this point in the history 
Disable docker restarts, for now
  • Loading branch information
@smarterclayton
smarterclayton committed Aug 7, 2014
2 parents b43e386 + 92f13ce commit 4123a44
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/docker/docker-defaults
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DOCKER_OPTS="--bridge cbr0 --iptables=false"
DOCKER_OPTS="--bridge cbr0 --iptables=false -r=false"

0 comments on commit 4123a44

Please sign in to comment.