From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 19 Feb 2013 21:08:53 +0000 (+0000)
Subject: Merge "Improve error handling when nvp and quantum are out of sync"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5355e5b794efe2cea137ad4e577a0e6ce73b5c18;p=openstack-build%2Fneutron-build.git

Merge "Improve error handling when nvp and quantum are out of sync"
---

5355e5b794efe2cea137ad4e577a0e6ce73b5c18
diff --cc quantum/tests/unit/nicira/test_nicira_plugin.py
index d5c527836,f96b4bfe1..d567053f3
--- a/quantum/tests/unit/nicira/test_nicira_plugin.py
+++ b/quantum/tests/unit/nicira/test_nicira_plugin.py
@@@ -19,9 -19,9 +19,10 @@@ import o
  
  import mock
  from oslo.config import cfg
 +import netaddr
  import webob.exc
  
+ from quantum.common import constants
  import quantum.common.test_lib as test_lib
  from quantum import context
  from quantum.extensions import providernet as pnet