From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 13 Dec 2014 07:46:22 +0000 (+0000)
Subject: Merge "radvd: pass -m syslog to avoid thread lock for radvd 2.0+"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e6f7ed5ea65156296ab6b3e96a603f5614be0a74;p=openstack-build%2Fneutron-build.git

Merge "radvd: pass -m syslog to avoid thread lock for radvd 2.0+"
---

e6f7ed5ea65156296ab6b3e96a603f5614be0a74
diff --cc neutron/tests/unit/test_l3_agent.py
index e50eda7cc,339dae14e..507c663cd
--- a/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@@ -23,11 -24,10 +23,12 @@@ from oslo import messagin
  from testtools import matchers
  
  from neutron.agent.common import config as agent_config
 -from neutron.agent import l3_agent
 -from neutron.agent import l3_ha_agent
 +from neutron.agent.l3 import agent as l3_agent
 +from neutron.agent.l3 import ha
 +from neutron.agent.l3 import link_local_allocator as lla
 +from neutron.agent.l3 import router_info as l3router
  from neutron.agent.linux import interface
+ from neutron.agent.linux import ra
  from neutron.common import config as base_config
  from neutron.common import constants as l3_constants
  from neutron.common import exceptions as n_exc