Merge pull request #15728 from a-robinson/dockerlog

Auto commit by PR queue bot
2015-10-19 06:59:38 -07:00
parent 77207d75e1 40d1a01fa8
commit 0e1b78fb6e
1 changed files with 1 additions and 1 deletions
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -1,3 +1,3 @@
 {% set grains_opts = grains.get('docker_opts', '') -%}
-DOCKER_OPTS="{{grains_opts}} --bridge=cbr0 --iptables=false --ip-masq=false"
+DOCKER_OPTS="{{grains_opts}} --bridge=cbr0 --iptables=false --ip-masq=false --log-level=warn"
 DOCKER_NOFILE=1000000