docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1286 from vieux/fix_merge_issue 

fix merge issue
This commit is contained in:
Alexandre Beslic 2015-10-13 12:42:09 -07:00
parent 1e30ce215f 6d6927d1de
commit 47d4563124
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/swarm/cluster.go
View File

@ -348,12 +348,12 @@ func (c *Cluster) CreateNetwork(request *dockerclient.NetworkCreate) (response *
config = cluster.BuildContainerConfig(dockerclient.ContainerConfig{Env: []string{"constraint:node==" + parts[0]}})
}
n, err := c.scheduler.SelectNodeForContainer(c.listNodes(), config)
nodes, err := c.scheduler.SelectNodesForContainer(c.listNodes(), config)
if err != nil {
return nil, err
}
if n != nil {
return c.engines[n.ID].CreateNetwork(request)
if nodes != nil {
return c.engines[nodes[0].ID].CreateNetwork(request)
}
return nil, nil
}