Merge lp:~vivekys/nova/lp788550 into lp:~hudson-openstack/nova/trunk

Proposed by vivek.ys
Status: Merged
Approved by: Devin Carlen
Approved revision: 1120
Merged at revision: 1121
Proposed branch: lp:~vivekys/nova/lp788550
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 38 lines (+4/-3)
2 files modified
Authors (+1/-0)
nova/virt/vmwareapi/vmops.py (+3/-3)
To merge this branch: bzr merge lp:~vivekys/nova/lp788550
Reviewer Review Type Date Requested Status
Alex Meade (community) Approve
Devin Carlen (community) Approve
Brian Waldon (community) Approve
Review via email: mp+62991@code.launchpad.net

Description of the change

Fixed the APIError typo

To post a comment you must log in.
Revision history for this message
Brian Waldon (bcwaldon) wrote :

Looks good.

review: Approve
Revision history for this message
Alex Meade (alex-meade) wrote :

This is a good catch, you'll need to add your name to the Authors file though

review: Needs Fixing
lp:~vivekys/nova/lp788550 updated
1120. By Vivek YS <email address hidden>

Added myself to Authors file

Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Alex Meade (alex-meade) wrote :

:)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Authors'
--- Authors 2011-05-27 04:37:39 +0000
+++ Authors 2011-05-31 15:41:17 +0000
@@ -84,6 +84,7 @@
84Tushar Patil <tushar.vitthal.patil@gmail.com>84Tushar Patil <tushar.vitthal.patil@gmail.com>
85Vasiliy Shlykov <vash@vasiliyshlykov.org>85Vasiliy Shlykov <vash@vasiliyshlykov.org>
86Vishvananda Ishaya <vishvananda@gmail.com>86Vishvananda Ishaya <vishvananda@gmail.com>
87Vivek Y S <vivek.ys@gmail.com>
87William Wolf <throughnothing@gmail.com>88William Wolf <throughnothing@gmail.com>
88Yoshiaki Tamura <yoshi@midokura.jp>89Yoshiaki Tamura <yoshi@midokura.jp>
89Youcef Laribi <Youcef.Laribi@eu.citrix.com>90Youcef Laribi <Youcef.Laribi@eu.citrix.com>
9091
=== modified file 'nova/virt/vmwareapi/vmops.py'
--- nova/virt/vmwareapi/vmops.py 2011-04-26 22:48:28 +0000
+++ nova/virt/vmwareapi/vmops.py 2011-05-31 15:41:17 +0000
@@ -590,11 +590,11 @@
590590
591 def pause(self, instance, callback):591 def pause(self, instance, callback):
592 """Pause a VM instance."""592 """Pause a VM instance."""
593 raise exception.APIError("pause not supported for vmwareapi")593 raise exception.ApiError("pause not supported for vmwareapi")
594594
595 def unpause(self, instance, callback):595 def unpause(self, instance, callback):
596 """Un-Pause a VM instance."""596 """Un-Pause a VM instance."""
597 raise exception.APIError("unpause not supported for vmwareapi")597 raise exception.ApiError("unpause not supported for vmwareapi")
598598
599 def suspend(self, instance, callback):599 def suspend(self, instance, callback):
600 """Suspend the specified instance."""600 """Suspend the specified instance."""
@@ -673,7 +673,7 @@
673673
674 def get_diagnostics(self, instance):674 def get_diagnostics(self, instance):
675 """Return data about VM diagnostics."""675 """Return data about VM diagnostics."""
676 raise exception.APIError("get_diagnostics not implemented for "676 raise exception.ApiError("get_diagnostics not implemented for "
677 "vmwareapi")677 "vmwareapi")
678678
679 def get_console_output(self, instance):679 def get_console_output(self, instance):