From cc906e48c13012da552cc346146d9586afc6092e Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Wed, 29 Dec 2010 10:35:29 -0600
Subject: Updating Authors

---
 .mailmap | 1 +
 Authors  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 9ab7db743..9ac8f2efd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,3 +27,4 @@
 <vishvananda@gmail.com> <root@ubuntu>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
 <rlane@wikimedia.org> <laner@controller>
+<rick.harris@rackspace.com> <rconradharris@gmail.com>
diff --git a/Authors b/Authors
index 299114dad..407b407c8 100644
--- a/Authors
+++ b/Authors
@@ -25,7 +25,7 @@ Michael Gundlach <michael.gundlach@rackspace.com>
 Monty Taylor <mordred@inaugust.com>
 Paul Voccio <paul@openstack.org>
 Rick Clark <rick@openstack.org>
-Rick Harris <rick.harris@rackspace.com>
+Rick Harris <rconradharris@gmail.com>
 Ryan Lane <rlane@wikimedia.org>
 Ryan Lucio <rlucio@internap.com>
 Salvatore Orlando <salvatore.orlando@eu.citrix.com>
-- 
cgit