summaryrefslogtreecommitdiff
path: root/novaclient/utils.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-23 03:53:12 +0000
committerGerrit Code Review <review@openstack.org>2014-09-23 03:53:12 +0000
commit963484513de810cc5a96a91f9df24c8c21deb942 (patch)
tree8c527f584579206d625b3c6bcef039d2f76253f2 /novaclient/utils.py
parent1621c93cfa6dd966013f8583abbcb369056c8d64 (diff)
parent8c0fd9a67420ac5c8138eb0ae6132559b40f1e9e (diff)
downloadpython-novaclient-963484513de810cc5a96a91f9df24c8c21deb942.tar.gz
Merge "Use oslo.serialization"
Diffstat (limited to 'novaclient/utils.py')
-rw-r--r--novaclient/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/novaclient/utils.py b/novaclient/utils.py
index 3f4be439..2fee83d6 100644
--- a/novaclient/utils.py
+++ b/novaclient/utils.py
@@ -16,6 +16,7 @@ import re
import textwrap
import uuid
+from oslo.serialization import jsonutils
from oslo.utils import encodeutils
import pkg_resources
import prettytable
@@ -24,7 +25,6 @@ import six
from novaclient import exceptions
from novaclient.openstack.common import cliutils
from novaclient.openstack.common.gettextutils import _
-from novaclient.openstack.common import jsonutils
arg = cliutils.arg