docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Merge pull request #24924 from yongtang/07222016-improve-no-manager-error

Browse Source 
Update the errNoManager() to conform to `swarm join-token`
Upstream-commit: 01f38dc42c7203ab2f86e6193cfa38e84eb2389a
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-07-22 12:28:29 +02:00
committed by GitHub
parent 8a7079d20e ce1e21d6ce
commit 6a74bf400c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/cluster/cluster.go
View File

@@ -625,7 +625,7 @@ func (c *Cluster) isActiveManager() bool {
// Call with read lock.
func (c *Cluster) errNoManager() error {
if c.node == nil {
return fmt.Errorf("This node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join --manager\" to connect this node to swarm and try again.")
return fmt.Errorf("This node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join\" to connect this node to swarm and try again.")
}
if c.node.Manager() != nil {
return fmt.Errorf("This node is not a swarm manager. Manager is being prepared or has trouble connecting to the cluster.")