Merge branch 'master' into cleanup-ipc

This commit is contained in:
Jeffrey Morgan 2015-03-07 21:51:32 -05:00
commit 16bf26959f
1 changed files with 1 additions and 1 deletions

View File

@ -48,7 +48,7 @@ var Docker = {
tryCount += 1; tryCount += 1;
yield Promise.delay(delay); yield Promise.delay(delay);
if (tryCount > tries) { if (tryCount > tries) {
throw new Error(err); throw new Error('Cannot connect to the Docker Engine. Either the VM is not responding or the connection may be blocked (VPN or Proxy): ' + err.message);
} }
continue; continue;
} }