From c6cd4b37c7ff3ab39dba289f5c8cd4c61d45a81b Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 22 Jul 2016 00:20:52 -0700 Subject: [PATCH] Update the errNoManager() to conform to `swarm join-token` In 24823, `swarm join` has been updated to take a `--token` flag and flag `--manager` has been removed. Though in errNoManager() the error message still use the old description. This fix update the error message in errNoManager() and conforms to the current available flags. This fix is related to 24823. Signed-off-by: Yong Tang (cherry picked from commit 3d30155735d572376500729496de657459493213) Signed-off-by: Tibor Vass --- daemon/cluster/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index 71d782902a..c77fa894cc 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -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.")