diff options
| -rw-r--r-- | ceilometer/alarm/notifier/rest.py | 4 | ||||
| -rw-r--r-- | ceilometer/messaging.py | 2 | ||||
| -rw-r--r-- | ceilometer/tests/publisher/test_utils.py | 2 | ||||
| -rw-r--r-- | openstack-common.conf | 1 | ||||
| -rw-r--r-- | requirements.txt | 1 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index 1648cde1..56660b02 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/ceilometer/alarm/notifier/rest.py @@ -1,5 +1,5 @@ # -# Copyright 2013 eNovance +# Copyright 2013-2014 eNovance # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # @@ -18,13 +18,13 @@ import eventlet from oslo.config import cfg +from oslo.serialization import jsonutils import requests import six.moves.urllib.parse as urlparse from ceilometer.alarm import notifier from ceilometer.openstack.common import context from ceilometer.openstack.common.gettextutils import _ -from ceilometer.openstack.common import jsonutils from ceilometer.openstack.common import log LOG = log.getLogger(__name__) diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 3c0dee45..5a88592f 100644 --- a/ceilometer/messaging.py +++ b/ceilometer/messaging.py @@ -17,9 +17,9 @@ from oslo.config import cfg import oslo.messaging +from oslo.serialization import jsonutils from ceilometer.openstack.common import context -from ceilometer.openstack.common import jsonutils DEFAULT_URL = "__default__" TRANSPORTS = {} diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/publisher/test_utils.py index db77aa9a..479fc5c9 100644 --- a/ceilometer/tests/publisher/test_utils.py +++ b/ceilometer/tests/publisher/test_utils.py @@ -18,9 +18,9 @@ # under the License. """Tests for ceilometer/publisher/utils.py """ +from oslo.serialization import jsonutils from oslotest import base -from ceilometer.openstack.common import jsonutils from ceilometer.publisher import utils diff --git a/openstack-common.conf b/openstack-common.conf index 84e18253..0cc63dd1 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -5,7 +5,6 @@ module=config module=context module=eventlet_backdoor module=gettextutils -module=jsonutils module=local module=log module=log_handler diff --git a/requirements.txt b/requirements.txt index 0a8f9ac7..54dce682 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,6 +20,7 @@ pbr>=0.6,!=0.7,<1.0 pecan>=0.5.0 posix_ipc oslo.messaging>=1.4.0.0a3 +oslo.serialization>=0.1.0 oslo.utils>=0.2.0 # Apache-2.0 pysnmp>=4.2.1,<5.0.0 python-ceilometerclient>=1.0.6 |