From 13e8c8d83b8fc44cff343ea751a98f66857d1865 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 23 Dec 2010 13:14:56 -0600
Subject: Resolved merge conflict

---
 nova/virt/xenapi_conn.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 4ea8a6737..2bf29b295 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -225,13 +225,8 @@ class XenAPISession(object):
             name = self._session.xenapi.task.get_name_label(task)
             status = self._session.xenapi.task.get_status(task)
             action = dict(
-<<<<<<< TREE
-                instance_id=int(instance_id),
+                instance_id=int(id),
                 action=name[0:255],  # Ensure action is never > 255
-=======
-                id=int(id),
-                action=name,
->>>>>>> MERGE-SOURCE
                 error=None)
             if status == "pending":
                 return
-- 
cgit