From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 19 Jan 2015 09:33:46 +0000 (+0000)
Subject: Merge "Migrate to oslo.concurrency"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=debb277f79b69a8017210c053ca8716a35463cab;p=openstack-build%2Fneutron-build.git

Merge "Migrate to oslo.concurrency"
---

debb277f79b69a8017210c053ca8716a35463cab
diff --cc neutron/agent/linux/iptables_manager.py
index 5c04b5e64,bfd49f074..d27ee6b36
--- a/neutron/agent/linux/iptables_manager.py
+++ b/neutron/agent/linux/iptables_manager.py
@@@ -29,10 -29,8 +30,9 @@@ from oslo_concurrency import lockutil
  from neutron.agent.common import config
  from neutron.agent.linux import iptables_comments as ic
  from neutron.agent.linux import utils as linux_utils
 +from neutron.common import exceptions as n_exc
  from neutron.common import utils
  from neutron.i18n import _LE, _LW
- from neutron.openstack.common import lockutils
  from neutron.openstack.common import log as logging
  
  LOG = logging.getLogger(__name__)