Merge lp:~javier.collado/utah/typos_fixed into lp:utah

Proposed by Javier Collado
Status: Merged
Merged at revision: 487
Proposed branch: lp:~javier.collado/utah/typos_fixed
Merge into: lp:utah
Diff against target: 42 lines (+4/-4)
2 files modified
utah/provisioning/provisioning.py (+3/-3)
utah/provisioning/vm/libvirtvm.py (+1/-1)
To merge this branch: bzr merge lp:~javier.collado/utah/typos_fixed
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+115815@code.launchpad.net

Description of the change

Just a few typos I found while I was looking at the code.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py 2012-07-19 13:29:56 +0000
+++ utah/provisioning/provisioning.py 2012-07-19 19:24:24 +0000
@@ -170,7 +170,7 @@
170170
171 def activecheck(self):171 def activecheck(self):
172 """172 """
173 Check if the machine is running and able to accept comamnds, start it173 Check if the machine is running and able to accept commands, start it
174 if necessary, and raise an exception if it cannot be started.174 if necessary, and raise an exception if it cannot be started.
175 """175 """
176 self.logger.debug('Checking if machine is active')176 self.logger.debug('Checking if machine is active')
@@ -211,7 +211,7 @@
211 If new=True or the machine is not installed, this should install the211 If new=True or the machine is not installed, this should install the
212 machine, possibly by calling _create().212 machine, possibly by calling _create().
213 If an existing machine is requested, this should make the machine213 If an existing machine is requested, this should make the machine
214 available, possibly by caling _load().214 available, possibly by calling _load().
215 Should generally not be called directly outside of the class;215 Should generally not be called directly outside of the class;
216 provisioncheck() or activecheck() should be used.216 provisioncheck() or activecheck() should be used.
217 """217 """
@@ -231,7 +231,7 @@
231 """231 """
232 Release resources consumed by the machine, set provisioned to False,232 Release resources consumed by the machine, set provisioned to False,
233 and return True on success.233 and return True on success.
234 For a VM, this should destory the VM files on the disk, and remove it234 For a VM, this should destroy the VM files on the disk, and remove it
235 from libvirt if it is registered there.235 from libvirt if it is registered there.
236 For a physical machine, this should free it up to be used by another236 For a physical machine, this should free it up to be used by another
237 process in the future, and destroy sensitive data if any exists.237 process in the future, and destroy sensitive data if any exists.
238238
=== modified file 'utah/provisioning/vm/libvirtvm.py'
--- utah/provisioning/vm/libvirtvm.py 2012-07-19 13:29:56 +0000
+++ utah/provisioning/vm/libvirtvm.py 2012-07-19 19:24:24 +0000
@@ -144,7 +144,7 @@
144 self.logger.info('Using vm-wait to ensure VM is active')144 self.logger.info('Using vm-wait to ensure VM is active')
145 if (self._runargs(['vm-wait', self.name, '300']) != 0):145 if (self._runargs(['vm-wait', self.name, '300']) != 0):
146 self.active = False146 self.active = False
147 raise UTAHVMProvisioningException('Timed out waiting for VM to ve reachable')147 raise UTAHVMProvisioningException('Timed out waiting for VM to be reachable')
148 else:148 else:
149 self.active = True149 self.active = True
150150

Subscribers

People subscribed via source and target branches