From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 25 Sep 2014 09:27:01 +0000 (+0000)
Subject: Merge "Deletes floating ip related connection states"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=303bd9d29a151d2ead3d5385a6e271fd9fff304b;p=openstack-build%2Fneutron-build.git

Merge "Deletes floating ip related connection states"
---

303bd9d29a151d2ead3d5385a6e271fd9fff304b
diff --cc neutron/agent/linux/interface.py
index 8273e1335,7613db410..538527b07
--- a/neutron/agent/linux/interface.py
+++ b/neutron/agent/linux/interface.py
@@@ -23,9 -23,9 +23,10 @@@ from neutron.agent.common import confi
  from neutron.agent.linux import ip_lib
  from neutron.agent.linux import ovs_lib
  from neutron.agent.linux import utils
 +from neutron.common import constants as n_const
  from neutron.common import exceptions
  from neutron.extensions import flavor
+ from neutron.openstack.common.gettextutils import _LE
  from neutron.openstack.common import importutils
  from neutron.openstack.common import log as logging