summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/docker/catlfish-dev/merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/docker/catlfish-dev/merge.sh b/packaging/docker/catlfish-dev/merge.sh
index b3658cd..40f623c 100755
--- a/packaging/docker/catlfish-dev/merge.sh
+++ b/packaging/docker/catlfish-dev/merge.sh
@@ -22,6 +22,7 @@ while true; do
python /usr/local/src/catlfish/tools/merge.py \
--config /usr/local/etc/catlfish/system.cfg \
--localconfig /usr/local/etc/catlfish/merge.cfg
+ date
echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again"
sleep $S2
done