From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 27 Jun 2014 06:01:17 +0000 (+0000)
Subject: Merge "ofagent: Use port desc to monitor ports on br-int"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f8b4eb12af7d5b9292e5b8acb8889c537cba139a;p=openstack-build%2Fneutron-build.git

Merge "ofagent: Use port desc to monitor ports on br-int"
---

f8b4eb12af7d5b9292e5b8acb8889c537cba139a
diff --cc neutron/plugins/ofagent/agent/ofa_neutron_agent.py
index 0907ea4aa,5cc77ec4e..28223a5e9
--- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
+++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
@@@ -39,7 -39,9 +39,8 @@@ from neutron.common import utils as n_u
  from neutron import context
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import loopingcall
 -from neutron.openstack.common.rpc import dispatcher
  from neutron.plugins.common import constants as p_const
+ from neutron.plugins.ofagent.agent import ports
  from neutron.plugins.ofagent.common import config  # noqa
  from neutron.plugins.openvswitch.common import constants