diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-20 00:53:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-20 00:53:07 +0000 |
| commit | a1cb060a14aa58465b9a6d7aa15433cd483e73c3 (patch) | |
| tree | 5634b362a34ff643ead3e4aaa077f6d30cef95a9 | |
| parent | c003406641114f3d8904bc38c1c3070ff7430505 (diff) | |
| parent | b01c266c5d0250197147f276d5edf7215e6fb510 (diff) | |
| download | nova-a1cb060a14aa58465b9a6d7aa15433cd483e73c3.tar.gz nova-a1cb060a14aa58465b9a6d7aa15433cd483e73c3.tar.xz nova-a1cb060a14aa58465b9a6d7aa15433cd483e73c3.zip | |
Merge "Ensure rpc result is primitive types."
| -rw-r--r-- | nova/scheduler/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 176d1f014..6b47f37f8 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -36,6 +36,7 @@ from nova import notifications from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils +from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common.notifier import api as notifier from nova import quota @@ -291,4 +292,4 @@ class SchedulerManager(manager.Manager): filter_properties""" hosts = self.driver.select_hosts(context, request_spec, filter_properties) - return hosts + return jsonutils.to_primitive(hosts) |