diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-01-06 04:59:13 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-01-06 04:59:13 -0400 |
| commit | 792ba27a6e6d5abb51b2659cd02e7fb5f8bd1cf4 (patch) | |
| tree | 59086bd4bbaaf3dde33c19d7d5a5a98126a2865e /nova/api | |
| parent | 457e19826cfdb7f8f324180e42d8df79da48cfc6 (diff) | |
| parent | 9eca4d51f55b078942c9886fd5b785d6f045c6d2 (diff) | |
| download | nova-792ba27a6e6d5abb51b2659cd02e7fb5f8bd1cf4.tar.gz nova-792ba27a6e6d5abb51b2659cd02e7fb5f8bd1cf4.tar.xz nova-792ba27a6e6d5abb51b2659cd02e7fb5f8bd1cf4.zip | |
merge with trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 0c0027287..6619b5452 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -592,7 +592,7 @@ class CloudController(object): return {'reservationSet': self._format_instances(context)} def _format_run_instances(self, context, reservation_id): - i = self._format_instances(context, reservation_id) + i = self._format_instances(context, reservation_id=reservation_id) assert len(i) == 1 return i[0] |