diff options
| author | Jason Koelker <jason@koelker.net> | 2011-09-14 10:19:03 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-09-14 10:19:03 -0500 |
| commit | f229adef552cf313fa2c5806098577e4864887f4 (patch) | |
| tree | 4f50bad1d6a282526dcddc332ffe1450edcf2a6c /nova/compute | |
| parent | 1a8f5bb3961f000d3159fd7478e8644afed5dc8d (diff) | |
| parent | b96d0af411163d295a96da277b7da2defce5f7f7 (diff) | |
merge the trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index acf7715ff..8b73a8954 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1060,7 +1060,7 @@ class API(base.Base): vm_state=vm_states.ACTIVE, task_state=task_states.REBOOTING) self._cast_compute_message('reboot_instance', context, instance_id, - reboot_type) + params={'reboot_type': reboot_type}) @scheduler_api.reroute_compute("rebuild") def rebuild(self, context, instance_id, image_href, admin_password, |