summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTonis Tiigi <tonistiigi@gmail.com>2016-06-14 10:14:13 -0700
committerTonis Tiigi <tonistiigi@gmail.com>2016-06-14 10:20:47 -0700
commit499e3a45b17eff6d52abe6ba9063fe365415cf08 (patch)
treee6bf3f3468eb0c55fc13991f86386e940a509172
parent32f18616c70c52298ea7e07529acba852aa87c86 (diff)
downloaddocker-499e3a45b17eff6d52abe6ba9063fe365415cf08.tar.gz
Increase the join connect timeout
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
-rw-r--r--daemon/cluster/cluster.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go
index 1746e9b2cf..a83c2e5d14 100644
--- a/daemon/cluster/cluster.go
+++ b/daemon/cluster/cluster.go
@@ -28,7 +28,7 @@ import (
const swarmDirName = "swarm"
const controlSocket = "control.sock"
-const swarmConnectTimeout = 5 * time.Second
+const swarmConnectTimeout = 10 * time.Second
const stateFile = "docker-state.json"
const (