Merge branch 'master' into dev

2015-03-17 01:53:41 +08:00 · 2015-03-17 01:53:41 +08:00 · bf5785cac2
parent 20a2d4b01a b61bcc3ccc
commit bf5785cac2
1 changed files with 1 additions and 1 deletions
--- a/rel/files/emqttd_ctl
+++ b/rel/files/emqttd_ctl
@ -192,7 +192,7 @@ case "$1" in
            echo "emqttd is not running!"
            exit 1
        fi
-        if [ $# -eq 2 && $2 = "list"]; then
+        if [ $# -eq 2 -a $2 = "list" ]; then
            $NODETOOL rpc emqttd_ctl plugins list
        elif [ $# -eq 3 ]; then
            shift