diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-19 14:07:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-19 14:07:11 +0000 |
| commit | c1d7dd7af8b13b9f9baf589f2e58ba2f8afef75b (patch) | |
| tree | 73097b09ae82d125fc2535ea7974ea4d7fa7b838 /nova/db | |
| parent | c2c99310d9c741be0e218638819dc5254fae145e (diff) | |
| parent | 6e92a67fc3e6dcd587e3fd225b7142bc74116e52 (diff) | |
Merge "Remove nova.flags"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 1 | ||||
| -rw-r--r-- | nova/db/base.py | 1 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/082_essex.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migration.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 1 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 1 |
7 files changed, 2 insertions, 7 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 51d6dc6ab..26463cd01 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -45,7 +45,6 @@ these objects be simple dictionaries. from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova import utils diff --git a/nova/db/base.py b/nova/db/base.py index e1393e2ef..650edd42f 100644 --- a/nova/db/base.py +++ b/nova/db/base.py @@ -19,7 +19,6 @@ """Base class for classes that need modular database access.""" from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import importutils diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 5232c8dab..9ab47a042 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -43,7 +43,6 @@ from nova import db from nova.db.sqlalchemy import models from nova.db.sqlalchemy.session import get_session from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova.openstack.common import uuidutils diff --git a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py index 99254d35e..ce795b071 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py @@ -18,7 +18,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey from sqlalchemy import Index, Integer, MetaData, String, Table, Text -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 31c40234a..5f17f96f4 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -19,10 +19,10 @@ import distutils.version as dist_version import os +from nova import config from nova.db import migration from nova.db.sqlalchemy.session import get_engine from nova import exception -from nova import flags from nova.openstack.common import log as logging diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index d002a941d..e4980e57b 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -30,7 +30,6 @@ from sqlalchemy.orm import relationship, backref, object_mapper from nova import config from nova.db.sqlalchemy.session import get_session from nova import exception -from nova import flags from nova.openstack.common import timeutils diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 9f9ccf797..f16b9d161 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -171,7 +171,6 @@ from sqlalchemy.pool import NullPool, StaticPool from nova import config import nova.exception -import nova.flags as flags import nova.openstack.common.log as logging |