Merge branch 'master' into createcorelib

This commit is contained in:
Nico Schottelius 2011-07-28 10:58:59 +02:00
commit 76a796103c

View file

@ -42,13 +42,13 @@ fi
i=0 i=0
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
if [ "$parallel" ]; then if [ "$parallel" ]; then
cdist-deploy-to "$1" | filter "$1" & cdist-deploy-to "$1" 2>&1 | filter "$1" &
# Record pid and host for use later # Record pid and host for use later
i=$((i+1)) i=$((i+1))
eval pid_$i=$! eval pid_$i=$!
eval host_$i=\$1 eval host_$i=\$1
else else
cdist-deploy-to "$1" | filter "$1" cdist-deploy-to "$1" 2>&1 | filter "$1"
fi fi
shift shift
done done