p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote

Browse Source 
fix err in note at daemon/networkdriver/bridge/driver.go
Upstream-commit: 377e62aa027337cf360f22cbf54fdec87743776f
Component: engine
This commit is contained in:
moxiegirl
2015-03-02 12:31:37 -08:00
parent c6435e1b51 8ce83c8f78
commit 6a658a3da6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/networkdriver/bridge/driver.go
View File

@ -113,7 +113,7 @@ func InitDriver(job *engine.Job) engine.Status {
addrv4, addrsv6, err := networkdriver.GetIfaceAddr(bridgeIface)
if err != nil {
// No Bridge existent. Create one
// No Bridge existent, create one
// If we're not using the default bridge, fail without trying to create it
if !usingDefaultBridge {
return job.Error(err)
@ -137,7 +137,7 @@ func InitDriver(job *engine.Job) engine.Status {
}
}
} else {
// Bridge exists already. Getting info...
// Bridge exists already, getting info...
// validate that the bridge ip matches the ip specified by BridgeIP
if bridgeIP != "" {
networkv4 = addrv4.(*net.IPNet)