UTAH

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

  1. typos_fixed
  2. Merge into dev
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
1=== modified file 'utah/provisioning/provisioning.py'
2--- utah/provisioning/provisioning.py 2012-07-19 13:29:56 +0000
3+++ utah/provisioning/provisioning.py 2012-07-19 19:24:24 +0000
4@@ -170,7 +170,7 @@
5
6 def activecheck(self):
7 """
8- Check if the machine is running and able to accept comamnds, start it
9+ Check if the machine is running and able to accept commands, start it
10 if necessary, and raise an exception if it cannot be started.
11 """
12 self.logger.debug('Checking if machine is active')
13@@ -211,7 +211,7 @@
14 If new=True or the machine is not installed, this should install the
15 machine, possibly by calling _create().
16 If an existing machine is requested, this should make the machine
17- available, possibly by caling _load().
18+ available, possibly by calling _load().
19 Should generally not be called directly outside of the class;
20 provisioncheck() or activecheck() should be used.
21 """
22@@ -231,7 +231,7 @@
23 """
24 Release resources consumed by the machine, set provisioned to False,
25 and return True on success.
26- For a VM, this should destory the VM files on the disk, and remove it
27+ For a VM, this should destroy the VM files on the disk, and remove it
28 from libvirt if it is registered there.
29 For a physical machine, this should free it up to be used by another
30 process in the future, and destroy sensitive data if any exists.
31
32=== modified file 'utah/provisioning/vm/libvirtvm.py'
33--- utah/provisioning/vm/libvirtvm.py 2012-07-19 13:29:56 +0000
34+++ utah/provisioning/vm/libvirtvm.py 2012-07-19 19:24:24 +0000
35@@ -144,7 +144,7 @@
36 self.logger.info('Using vm-wait to ensure VM is active')
37 if (self._runargs(['vm-wait', self.name, '300']) != 0):
38 self.active = False
39- raise UTAHVMProvisioningException('Timed out waiting for VM to ve reachable')
40+ raise UTAHVMProvisioningException('Timed out waiting for VM to be reachable')
41 else:
42 self.active = True
43

Subscribers

People subscribed via source and target branches