From b483167572c2b3aa7aca890e28188e82a23e6c7f Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Wed, 22 Dec 2010 13:27:51 -0500
Subject: [PATCH 1/4] Adding myself and Antony Messerli to the Authors file

---
 Authors | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Authors b/Authors
index fa38ef0b..6e873acf 100644
--- a/Authors
+++ b/Authors
@@ -1,9 +1,11 @@
 Andy Smith <code@term.ie>
 Anne Gentle <anne@openstack.org>
 Anthony Young <sleepsonthefloor@gmail.com>
+Antony Messerli <ant@openstack.org>
 Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
 Chris Behrens <cbehrens@codestud.com>
 Chmouel Boudjnah <chmouel@chmouel.com>
+Cory Wright <corywright@gmail.com>
 Dean Troyer <dtroyer@gmail.com>
 Devin Carlen <devin.carlen@gmail.com>
 Ed Leafe <ed@leafe.com>

From d3ad0918c257293a06de0f1147ca54e29e005fcb Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor@citrix.com>
Date: Tue, 28 Dec 2010 01:37:04 +0000
Subject: [PATCH 2/4] Bug #694880: nova-compute now depends upon Cheetah even
 when not using libvirt

Only import Cheetah when needed, as we do already with libvirt and libxml2.
This ensures that users of other virt backends don't need Cheetah to run
nova-compute.
---
 nova/tests/test_virt.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 1c155abe..4aa489d0 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -33,6 +33,7 @@ flags.DECLARE('instances_path', 'nova.compute.manager')
 class LibvirtConnTestCase(test.TestCase):
     def setUp(self):
         super(LibvirtConnTestCase, self).setUp()
+        libvirt_conn._late_load_cheetah()
         self.flags(fake_call=True)
         self.manager = manager.AuthManager()
         self.user = self.manager.create_user('fake', 'fake', 'fake',

From 8472bc47200c8300147797cc26e58331790d1b74 Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Tue, 28 Dec 2010 16:35:56 -0500
Subject: [PATCH 3/4] Update .mailmap with both email addresses for Ant and
 myself

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 9ab7db74..9e7fb1ec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,3 +27,5 @@
 <vishvananda@gmail.com> <root@ubuntu>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
 <rlane@wikimedia.org> <laner@controller>
+<corywright@gmail.com> <cory.wright@rackspace.com>
+<ant@openstack.org> <amesserl@rackspace.com>