From c0b5b3df0b6aff8cffec8d3f9bf7f0b2eca141af Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Sat, 10 Oct 2015 09:00:35 -0700 Subject: [PATCH] Default bridge need not have persistence in bridge driver Signed-off-by: Madhu Venugopal --- drivers/bridge/bridge_store.go | 2 +- network.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/bridge/bridge_store.go b/drivers/bridge/bridge_store.go index d22d9bf..96c31d8 100644 --- a/drivers/bridge/bridge_store.go +++ b/drivers/bridge/bridge_store.go @@ -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 { diff --git a/network.go b/network.go index 29c4d51..704ddb9 100644 --- a/network.go +++ b/network.go @@ -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