docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #2306 from ngauthier/fix-host-nil-swarm-options

Browse Source 
skip printing swarm info when host options swarm info is nil
This commit is contained in:
Nathan LeClaire
2015-11-17 16:40:51 -08:00
parent 8d19826c38 a34a394810
commit 96404cba4e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commands/ls.go
View File

@@ -91,7 +91,7 @@ func cmdLs(c CommandLine) error {
swarmInfo := ""
if item.SwarmOptions.Discovery != "" {
if item.SwarmOptions != nil && item.SwarmOptions.Discovery != "" {
swarmInfo = swarmMasters[item.SwarmOptions.Discovery]
if item.SwarmOptions.Master {
swarmInfo = fmt.Sprintf("%s (master)", swarmInfo)