Merge "Import order is fixed"

This commit is contained in:
Jenkins 2014-03-11 11:59:56 +00:00 committed by Gerrit Code Review
commit 126179129f

View File

@ -24,13 +24,13 @@ library to work with nova.
import re
import shelve
import six
import ldap
import six
from six import moves
from keystone.common import utils
from keystone.openstack.common import log
from six import moves
SCOPE_NAMES = {