From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 13 Mar 2015 17:58:55 +0000 (+0000)
Subject: Merge "Refactor _remove_unused_security_group_info"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7807b684d1cb4c9c3af4e2c853604fb919288e4e;p=openstack-build%2Fneutron-build.git

Merge "Refactor _remove_unused_security_group_info"
---

7807b684d1cb4c9c3af4e2c853604fb919288e4e
diff --cc neutron/agent/linux/iptables_firewall.py
index 8ad2db0a7,9896559dc..84ff96759
--- a/neutron/agent/linux/iptables_firewall.py
+++ b/neutron/agent/linux/iptables_firewall.py
@@@ -13,9 -13,9 +13,10 @@@
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
+ import collections
  import netaddr
 -from oslo.config import cfg
 +from oslo_config import cfg
 +from oslo_log import log as logging
  
  from neutron.agent import firewall
  from neutron.agent.linux import ipset_manager