Merge branch '2.2' into develop

2018-07-03 21:13:41 +03:00
parent b98c0841b4 fb1c28c702
commit 44ef4912e8
41 changed files with 233 additions and 110032 deletions
--- a/maxctrl/lib/common.js
+++ b/maxctrl/lib/common.js
@ -387,13 +387,15 @@ function getTable(headobj) {
 function pingCluster(hosts) {
    var promises = []

-    hosts.forEach(function(i) {
-        args = {}
-        args.uri = getUri(i, this.argv.secure, '')
-        args.json = true
-        setTlsCerts(args)
-        promises.push(request(args))
-    })
+    if (hosts.length > 1 ) {
+        hosts.forEach(function(i) {
+            args = {}
+            args.uri = getUri(i, this.argv.secure, '')
+            args.json = true
+            setTlsCerts(args)
+            promises.push(request(args))
+        })
+    }

    return Promise.all(promises)
 }