diff options
| author | mdietz <mdietz@openstack> | 2010-10-04 16:01:44 +0000 |
|---|---|---|
| committer | mdietz <mdietz@openstack> | 2010-10-04 16:01:44 +0000 |
| commit | 5c4b1a38b8a82ee0a8f14f813f91d319a9715cc3 (patch) | |
| tree | bdf8096d856a9acd311cbaf0309bcd4c2f2dfc57 /nova/api | |
| parent | 444b13d0272b56a26f5bff111d268ae8a978d2e2 (diff) | |
More clean up and conflict resolution
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 2fec49da8..f43da42bd 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -719,7 +719,7 @@ class CloudController(object): changes[field] = kwargs[field] if changes: db_context = {} - internal_id = ec2_id_to_internal_id(ec2_id) + internal_id = self.ec2_id_to_internal_id(ec2_id) inst = db.instance_get_by_internal_id(db_context, internal_id) db.instance_update(db_context, inst['id'], kwargs) return True |