summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-04-19 11:33:51 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-04-19 11:33:51 -0400
commit25e1e2d64ad43638ad4231e6e6edd84d96e14bdb (patch)
treee9ead31ad1e7ee5efead7fa6343727d828b72b1c
parentad2d97972d63f50500ec8215c7f8f04d87468060 (diff)
downloadnova-25e1e2d64ad43638ad4231e6e6edd84d96e14bdb.tar.gz
nova-25e1e2d64ad43638ad4231e6e6edd84d96e14bdb.tar.xz
nova-25e1e2d64ad43638ad4231e6e6edd84d96e14bdb.zip
Merged trunk and fixed small comment.
-rw-r--r--nova/virt/libvirt_conn.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 13378bbd2..2582b9730 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -360,7 +360,7 @@ class LibvirtConnection(driver.ComputeDriver):
raise
def _wait_for_destroy():
- """Called at an interval until the VM is running again."""
+ """Called at an interval until the VM is gone."""
instance_name = instance['name']
try: