Merge "Support Tacker client in master branch"

This commit is contained in:
Jenkins
2015-09-01 16:34:32 +00:00
committed by Gerrit Code Review
5 changed files with 6 additions and 6 deletions

View File

@@ -17,7 +17,7 @@ import logging
from xml.etree import ElementTree as etree from xml.etree import ElementTree as etree
from xml.parsers import expat from xml.parsers import expat
from oslo.serialization import jsonutils from oslo_serialization import jsonutils
import six import six
from tackerclient.common import constants from tackerclient.common import constants

View File

@@ -21,8 +21,8 @@ import argparse
import logging import logging
import os import os
from oslo.utils import encodeutils from oslo_utils import encodeutils
from oslo.utils import importutils from oslo_utils import importutils
import six import six
from tackerclient.common import exceptions from tackerclient.common import exceptions

View File

@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo import i18n import oslo_i18n as i18n
_translators = i18n.TranslatorFactory(domain='tackerclient') _translators = i18n.TranslatorFactory(domain='tackerclient')

View File

@@ -33,7 +33,7 @@ from keystoneclient.auth.identity import v3 as v3_auth
from keystoneclient import discover from keystoneclient import discover
from keystoneclient.openstack.common.apiclient import exceptions as ks_exc from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
from keystoneclient import session from keystoneclient import session
from oslo.utils import encodeutils from oslo_utils import encodeutils
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
from cliff import app from cliff import app

View File

@@ -24,7 +24,7 @@ import re
from cliff.formatters import table from cliff.formatters import table
from cliff import lister from cliff import lister
from cliff import show from cliff import show
from oslo.serialization import jsonutils from oslo_serialization import jsonutils
import six import six
from tackerclient.common import command from tackerclient.common import command