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 180042feb4
commit c0b5b3df0b
2 changed files with 5 additions and 2 deletions
+1 -1
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 {
+4 -1
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