]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Merge "Fix ATTR_NOT_SPECIFIED comparison errors"
authorJenkins <jenkins@review.openstack.org>
Wed, 16 Jan 2013 20:44:27 +0000 (20:44 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 16 Jan 2013 20:44:27 +0000 (20:44 +0000)
1  2 
quantum/db/loadbalancer/loadbalancer_db.py
quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
quantum/tests/unit/test_db_plugin.py

index db94a08462a8b4cc130a57f509463e31d4b2cc78,a5fa0626d5e427f74ce91a20f2d228b7e90badd1..e97b8e4b389d0baaf62f6f27cb70801fc351c042
@@@ -21,10 -20,10 +21,9 @@@ import unittest
  import webob.exc
  
  import quantum
 -from quantum import context
 -from quantum.api.extensions import PluginAwareExtensionManager
  from quantum.api.extensions import ExtensionMiddleware
 +from quantum.api.extensions import PluginAwareExtensionManager
  from quantum.api.v2 import attributes
- from quantum.api.v2.attributes import ATTR_NOT_SPECIFIED
  from quantum.api.v2.router import APIRouter
  from quantum.common import config
  from quantum.common import exceptions as q_exc
Simple merge