From 5c4b1a38b8a82ee0a8f14f813f91d319a9715cc3 Mon Sep 17 00:00:00 2001
From: mdietz <mdietz@openstack>
Date: Mon, 4 Oct 2010 16:01:44 +0000
Subject: More clean up and conflict resolution

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

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
-- 
cgit