summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-06-14 13:11:13 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-06-14 13:11:13 -0500
commit3bb80daeaf23a1e3f4cea577d5e9e96da0a1e6cd (patch)
tree0a4ddc6ee26cf278f14efc3dd1932f7cf6808c1c /nova/compute
parent1f430f7dd8e8e5af639d91048237048bdf8f21a9 (diff)
parent812fe496e2bae701ee7d90d289ff1062c631e14f (diff)
merged trunk
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 2a2dc6f0e..83a31707a 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -263,7 +263,7 @@ class API(base.Base):
'instance_type': instance_type,
'filter': filter_class,
'blob': zone_blob,
- 'num_instances': num_instances
+ 'num_instances': num_instances,
}
rpc.cast(context,