summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2012-01-04 14:33:45 -0800
committerRick Harris <rconradharris@gmail.com>2012-05-16 22:13:13 +0000
commit389764174e8e9a14cceb2a114f5d093c49e7529e (patch)
tree346f0f08425522251a3374e95e262a4c0b3915ab /.mailmap
parent3f9c617f6e801b322470dadd53da8f89406d5cf9 (diff)
downloadnova-389764174e8e9a14cceb2a114f5d093c49e7529e.tar.gz
Add aliases to .mailmap for comstud and belliott.
Change-Id: Id12e0347b11784b9739ed9713d3e151a94cf8f10
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 4f9e4e62c6..84e31bf536 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,10 +8,12 @@
<anotherjesse@gmail.com> <jesse@aire.local>
<ant@openstack.org> <amesserl@rackspace.com>
<Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
+<brian.elliott@rackspace.com> <bdelliott@gmail.com>
<brian.lamar@rackspace.com> <brian.lamar@gmail.com>
<brian.waldon@rackspace.com> <bcwaldon@gmail.com>
<bschott@isi.edu> <bfschott@gmail.com>
<cbehrens@codestud.com> <chris.behrens@rackspace.com>
+<cbehrens@codestud.com> <cbehrens+github@codestud.com>
<chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
<code@term.ie> <github@anarkystic.com>
<code@term.ie> <termie@preciousroy.local>