summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-02 22:13:15 +0000
committerGerrit Code Review <review@openstack.org>2015-11-02 22:13:15 +0000
commitb6d966d415ed254ee5bd7419f5761faee90b3702 (patch)
tree7b9b3c3f7b496f9b149dca5a0c4f788ef6cfcb7f
parentfb58b4ba5678dc694cb0937b925ed70232c4ae45 (diff)
parentb1263ff1b3cb5700136e2de136c9330e296c0f2c (diff)
downloadneutron-stable/juno.tar.gz
Merge "Resubmit of "Remove bridge cleanup call" fix" into stable/junojuno-eol2014.2.4stable/juno
-rwxr-xr-xneutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
index 00de63c425..88503016f1 100755
--- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -941,7 +941,6 @@ class LinuxBridgeNeutronAgentRPC(sg_rpc.SecurityGroupAgentRpcMixin):
LOG.info(_("Port %s updated."), device)
else:
LOG.debug(_("Device %s not defined on plugin"), device)
- self.br_mgr.remove_empty_bridges()
if self.prevent_arp_spoofing:
arp_protect.delete_arp_spoofing_protection(devices)
return resync