Merge branch 'v1.4' of github.com:StackStorm/st2 into v1.4

Kami · Kami · commit e77b201039b8 · 2016-04-20T20:18:12.000+02:00
diff --git a/st2common/bin/st2ctl b/st2common/bin/st2ctl
@@ -178,7 +178,7 @@ case ${1} in
   restart)
     must_be_root
     st2stop
-    sleep 1
+    sleep 10
     st2start
     getpids
     ;;
