kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Default bridge need not have persistence in bridge driver 

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2015-10-10 09:00:35 -07:00
parent 648393ef5f
commit 750671e633
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnetwork/drivers/bridge/bridge_store.go
View File

@ -193,7 +193,7 @@ func (ncfg *networkConfiguration) Exists() bool {
}
func (ncfg *networkConfiguration) Skip() bool {
return false
return ncfg.DefaultBridge
}
func (ncfg *networkConfiguration) New() datastore.KVObject {

5
libnetwork/network.go
View File

@ -623,7 +623,10 @@ func (n *network) deleteNetwork() error {
if _, ok := err.(types.ForbiddenError); ok {
return err
}
log.Warnf("driver error deleting network %s : %v", n.name, err)
if _, ok := err.(types.MaskableError); !ok {
log.Warnf("driver error deleting network %s : %v", n.name, err)
}
}
return nil