From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 23 Feb 2014 14:52:52 +0000 (+0000)
Subject: Merge "Extending quota support for neutron LBaaS entities"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5d199086a4a98ef29fe875243756ce9c213d752e;p=openstack-build%2Fneutron-build.git

Merge "Extending quota support for neutron LBaaS entities"
---

5d199086a4a98ef29fe875243756ce9c213d752e
diff --cc neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
index 94acdc6e0,8f3afb381..c5de64785
--- a/neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
+++ b/neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
@@@ -26,8 -26,10 +26,9 @@@ from neutron.api import extension
  from neutron.api.v2 import attributes as attr
  from neutron.common import config
  from neutron.extensions import loadbalancer
 -from neutron import manager
  from neutron.openstack.common import uuidutils
  from neutron.plugins.common import constants
+ from neutron import quota
  from neutron.tests.unit import test_api_v2
  from neutron.tests.unit import test_extensions
  from neutron.tests.unit import testlib_api