Merge pull request #1335 from vieux/fix_panic

fix panic when createContainer returns nil,nil
This commit is contained in:
Alexandre Beslic
2015-10-23 14:05:33 -07:00

View File

@@ -152,7 +152,7 @@ func (c *Cluster) createContainer(config *cluster.ContainerConfig, name string,
engine, ok := c.engines[n.ID]
if !ok {
c.scheduler.Unlock()
return nil, nil
return nil, fmt.Errorf("error creating container")
}
c.pendingContainers[swarmID] = &pendingContainer{