~0x44/nova/bug838466

396.2.1 by Soren Hansen
Added a .mailmap that maps addresses in bzr to people's real, preferred
1
# Format is:
2
# <preferred e-mail> <other e-mail>
3
<code@term.ie> <github@anarkystic.com>
4
<code@term.ie> <termie@preciousroy.local>
396.2.6 by Soren Hansen
Add an alias for Armando.
5
<Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
396.2.1 by Soren Hansen
Added a .mailmap that maps addresses in bzr to people's real, preferred
6
<matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
7
<matt.dietz@rackspace.com> <mdietz@openstack>
8
<cbehrens@codestud.com> <chris.behrens@rackspace.com>
9
<devin.carlen@gmail.com> <devcamcar@illian.local>
10
<ewan.mellor@citrix.com> <emellor@silver>
11
<jaypipes@gmail.com> <jpipes@serialcoder>
12
<anotherjesse@gmail.com> <jesse@dancelamb>
13
<anotherjesse@gmail.com> <jesse@gigantor.local>
14
<anotherjesse@gmail.com> <jesse@ubuntu>
15
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
16
<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
17
<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
18
<justin@fathomdb.com> <justinsb@justinsb-desktop>
19
<mordred@inaugust.com> <mordred@hudson>
20
<paul@openstack.org> <pvoccio@castor.local>
21
<paul@openstack.org> <paul.voccio@rackspace.com>
466.6.2 by Vishvananda Ishaya
merge trunk and upgrade to cheetah templating
22
<soren.hansen@rackspace.com> <soren@linux2go.dk>
396.2.1 by Soren Hansen
Added a .mailmap that maps addresses in bzr to people's real, preferred
23
<todd@ansolabs.com> <todd@lapex>
24
<todd@ansolabs.com> <todd@rubidine.com>
25
<vishvananda@gmail.com> <vishvananda@yahoo.com>
26
<vishvananda@gmail.com> <root@mirror.nasanebula.net>
486.1.1 by Vishvananda Ishaya
fix commits from Anthony and Vish that were committed with the wrong email
27
<vishvananda@gmail.com> <root@ubuntu>
28
<sleepsonthefloor@gmail.com> <root@tonbuntu>
486.1.2 by Vishvananda Ishaya
Add Ryan Lane as well
29
<rlane@wikimedia.org> <laner@controller>
466.7.18 by Rick Harris
Merging trunk
30
<rconradharris@gmail.com> <rick.harris@rackspace.com> 
469.5.14 by Cory Wright
Update .mailmap with both email addresses for Ant and myself
31
<corywright@gmail.com> <cory.wright@rackspace.com>
32
<ant@openstack.org> <amesserl@rackspace.com>
334.3.26 by Chiradeep Vittal
Add to Authors and mailmap
33
<chiradeep@cloud.com> <chiradeep@chiradeep-lt2>