diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-17 15:22:44 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-17 15:44:00 +0000 |
| commit | f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3 (patch) | |
| tree | fc46499db82de0829e1137b1d620bceb46cb787f /openstack/common/db/sqlalchemy | |
| parent | 8ce59472653439d646309395bf195ec6163ff29a (diff) | |
| download | oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.gz oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.xz oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.zip | |
Use oslo-config-2013.1b3
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
Remove the 'deps = pep8==1.3.3' and 'deps = pyflakes' from tox.ini as
it means all the other deps get installed with easy_install which can't
install oslo-config from the URL.
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'openstack/common/db/sqlalchemy')
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py index c6aeae6..1e9e123 100644 --- a/openstack/common/db/sqlalchemy/session.py +++ b/openstack/common/db/sqlalchemy/session.py @@ -246,13 +246,13 @@ import time from eventlet import db_pool from eventlet import greenthread +from oslo.config import cfg from sqlalchemy.exc import DisconnectionError, OperationalError, IntegrityError import sqlalchemy.interfaces import sqlalchemy.orm from sqlalchemy.pool import NullPool, StaticPool from sqlalchemy.sql.expression import literal_column -from openstack.common import cfg from openstack.common import importutils from openstack.common import log as logging from openstack.common.gettextutils import _ |