Merge branch 'master' into createcorelib

2011-07-28 10:58:59 +02:00 · 2011-07-28 10:58:59 +02:00 · 76a796103c
commit 76a796103c
parent 815de25d9a dc820cf31e
1 changed files with 2 additions and 2 deletions
--- a/bin/cdist-mass-deploy
+++ b/bin/cdist-mass-deploy
@ -42,13 +42,13 @@ fi
 i=0
 while [ $# -gt 0 ]; do
   if [ "$parallel" ]; then
-      cdist-deploy-to "$1" | filter "$1" &
+      cdist-deploy-to "$1" 2>&1 | filter "$1" &
      # Record pid and host for use later
      i=$((i+1))
      eval pid_$i=$!
      eval host_$i=\$1
   else
-      cdist-deploy-to "$1" | filter "$1"
+      cdist-deploy-to "$1" 2>&1 | filter "$1"
   fi
   shift
 done