diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-12 09:05:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-12 09:05:51 +0000 |
| commit | 06ea92ee170862342386498cfcaeeac017485b1f (patch) | |
| tree | bdf747352017f0c57f8cc40d886529ac85cab586 /nova | |
| parent | b828391d524fb352e147f5924f7db3ebafcb00f0 (diff) | |
| parent | 6ea308295a158b4700f4081913f66596fc769b36 (diff) | |
Merge "Fix some conductor manager return values."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/conductor/manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index fb583d0ce..a7bc08420 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -266,7 +266,9 @@ class ConductorManager(manager.SchedulerDependentManager): return jsonutils.to_primitive(result) def action_event_start(self, context, values): - return self.db.action_event_start(context, values) + evt = self.db.action_event_start(context, values) + return jsonutils.to_primitive(evt) def action_event_finish(self, context, values): - return self.db.action_event_finish(context, values) + evt = self.db.action_event_finish(context, values) + return jsonutils.to_primitive(evt) |