Merge pull request #957 from campbellr/issue914

Fix error message on bridge network creation conflict.
This commit is contained in:
aboch 2016-02-18 17:24:09 -08:00
commit a8d59fda75
1 changed files with 1 additions and 1 deletions

View File

@ -581,7 +581,7 @@ func (d *driver) createNetwork(config *networkConfiguration) error {
nw.Unlock()
if err := nwConfig.Conflicts(config); err != nil {
return types.ForbiddenErrorf("cannot create network %s (%s): conflicts with network %s (%s): %s",
nwConfig.BridgeName, config.ID, nw.id, nw.config.BridgeName, err.Error())
config.ID, config.BridgeName, nwConfig.ID, nwConfig.BridgeName, err.Error())
}
}