Merge "Use oslo_serialization replace oslo.serialization"

This commit is contained in:
Jenkins 2015-01-24 19:14:55 +00:00 committed by Gerrit Code Review
commit 6c47f13064
7 changed files with 7 additions and 7 deletions

View File

@ -20,8 +20,8 @@ import logging
import random
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo.utils import timeutils
from oslo_serialization import jsonutils
import six
import six.moves.urllib.parse as urlparse

View File

@ -29,7 +29,7 @@ __all__ = [
from oslo.config import cfg
from oslo import messaging
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from ironic.common import context as ironic_context
from ironic.common import exception

View File

@ -13,7 +13,7 @@
# limitations under the License.
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
import requests
from ironic.common import exception

View File

@ -39,7 +39,7 @@ import sys
import traceback
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from oslo.utils import importutils
import six
from six import moves

View File

@ -95,7 +95,7 @@ import os
import re
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
import six
import six.moves.urllib.parse as urlparse
import six.moves.urllib.request as urlrequest

View File

@ -23,7 +23,7 @@ import tempfile
import fixtures
import mock
from oslo.config import cfg
from oslo.serialization import jsonutils as json
from oslo_serialization import jsonutils as json
from ironic.common import dhcp_factory
from ironic.common import exception

View File

@ -33,7 +33,7 @@ from ironic.tests import matchers
from ironic.tests import stubs
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
CONF = cfg.CONF