summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rconradharris@gmail.com>2011-09-16 00:25:39 +0000
committerRick Harris <rconradharris@gmail.com>2011-09-16 00:25:39 +0000
commitbc8c34050df9060e9632f6a4fb341a2fc119e0c7 (patch)
tree875e26d47ad5f4744c398c7c863e55dcda7782ee
parent6f3ae6e1e5453330e14807348f6e3f6587877946 (diff)
parentaf7a495d7a2b394938e9677fc7fe679c9a963f8c (diff)
Merging trunk
-rw-r--r--nova/virt/xenapi/vmops.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index e6129436a..ca5ba9392 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -170,6 +170,7 @@ class VMOps(object):
def spawn(self, context, instance, network_info):
total_steps = 4
progress = {'value': 0}
+
def bump_progress():
# FIXME(sirp): for now we're taking a KISS approach to
# instance-build-progress: