~ubuntu-branches/ubuntu/quantal/keystone/quantal-security

« back to all changes in this revision

Viewing changes to keystone/catalog/backends/sql.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-06-22 12:27:50 UTC
  • mto: (35.1.1 quantal-proposed)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: package-import@ubuntu.com-20120622122750-4urdq17en1990apn
Tags: upstream-2012.2~f2~20120622.2353
ImportĀ upstreamĀ versionĀ 2012.2~f2~20120622.2353

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
# under the License.
17
17
 
18
18
from keystone import catalog
 
19
from keystone.common import sql
 
20
from keystone.common.sql import migration
19
21
from keystone import config
20
22
from keystone import exception
21
 
from keystone.common import sql
22
 
from keystone.common.sql import migration
23
23
 
24
24
 
25
25
CONF = config.CONF