summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2010-12-29 10:35:29 -0600
committerRick Harris <rick.harris@rackspace.com>2010-12-29 10:35:29 -0600
commitcc906e48c13012da552cc346146d9586afc6092e (patch)
tree2a0add1f68eaae834136da22a43ad7c09381d3a3
parentf27c7589e6f627983c48b8412d770524e346c3cc (diff)
Updating Authors
-rw-r--r--.mailmap1
-rw-r--r--Authors2
2 files changed, 2 insertions, 1 deletions
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>