summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-18 22:32:22 +0000
committerGerrit Code Review <review@openstack.org>2012-05-18 22:32:22 +0000
commit75cd4642db7859085336dcfd47862cdedc858b88 (patch)
treec28ccca635034dd660c32eac81274529dbf8df7b /.mailmap
parent129795c890963c9767ec59e41e3ed3334a2d29c7 (diff)
parent3ae69ebcc5febd79c6cfdb8e37ce34a2fe660655 (diff)
downloadnova-75cd4642db7859085336dcfd47862cdedc858b88.tar.gz
Merge "Fix Multi_Scheduler to process host capabilities"
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 66ae701dd5..9e3badb65f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,6 +8,7 @@
<anotherjesse@gmail.com> <jesse@aire.local>
<ant@openstack.org> <amesserl@rackspace.com>
<Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
+<Armando.Migliaccio@eu.citrix.com> <amigliaccio@internap.com>
<brian.elliott@rackspace.com> <bdelliott@gmail.com>
<brian.lamar@rackspace.com> <brian.lamar@gmail.com>
<brian.waldon@rackspace.com> <bcwaldon@gmail.com>