diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-23 13:14:56 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-23 13:14:56 -0600 |
| commit | 13e8c8d83b8fc44cff343ea751a98f66857d1865 (patch) | |
| tree | 833ee78ebea8b84a93e84b041e92063e8c9044bf | |
| parent | de40fa065b1bc6631e69992e1baeab629b89337d (diff) | |
| download | nova-13e8c8d83b8fc44cff343ea751a98f66857d1865.tar.gz nova-13e8c8d83b8fc44cff343ea751a98f66857d1865.tar.xz nova-13e8c8d83b8fc44cff343ea751a98f66857d1865.zip | |
Resolved merge conflict
| -rw-r--r-- | nova/virt/xenapi_conn.py | 7 |
1 files changed, 1 insertions, 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 |