From 6d6927d1de40557f4f06be7136a889b42c8b3018 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 13 Oct 2015 01:24:10 -0700 Subject: [PATCH] fix merge issue Signed-off-by: Victor Vieux --- cluster/swarm/cluster.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go index 4157ca3c68..55b93f950e 100644 --- a/cluster/swarm/cluster.go +++ b/cluster/swarm/cluster.go @@ -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 }