From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 10 Feb 2015 20:27:21 +0000 (+0000)
Subject: Merge "Deleting HA router with attached port causes DB inconsistencies"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=09c47b6ceb21f9277ac420396c44d1f4046cc695;p=openstack-build%2Fneutron-build.git

Merge "Deleting HA router with attached port causes DB inconsistencies"
---

09c47b6ceb21f9277ac420396c44d1f4046cc695
diff --cc neutron/tests/unit/db/test_l3_ha_db.py
index ab293661d,604f37f00..23c267394
--- a/neutron/tests/unit/db/test_l3_ha_db.py
+++ b/neutron/tests/unit/db/test_l3_ha_db.py
@@@ -13,8 -13,9 +13,9 @@@
  # under the License.
  
  import mock
 -from oslo.config import cfg
 +from oslo_config import cfg
  
+ from neutron.api.v2 import attributes
  from neutron.common import constants
  from neutron import context
  from neutron.db import agents_db