OpenStack Compute (nova)

Merge lp:~soren/nova/sort-authors into lp:~hudson-openstack/nova/trunk

  1. sort-authors
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Matt Dietz
Approved revision: 694
Merged at revision: 694
Proposed branch: lp:~soren/nova/sort-authors
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 110 lines (+31/-25)
2 files modified
.mailmap (+26/-20)
Authors (+5/-5)
To merge this branch: bzr merge lp:~soren/nova/sort-authors
Reviewer Review Type Date Requested Status
Matt Dietz (community) Approve
Jay Pipes (community) Approve
Review via email: mp+50224@code.launchpad.net

Commit message

Re-alphabetise Authors, move extra addresses into .mailmap.

Description of the change

Restore some order in Authors..

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm.

review: Approve
Revision history for this message
Matt Dietz (cerberus) wrote :

lgtm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.mailmap'
--- .mailmap 2011-02-17 17:13:20 +0000
+++ .mailmap 2011-02-17 20:30:11 +0000
@@ -1,37 +1,43 @@
1# Format is:1# Format is:
2# <preferred e-mail> <other e-mail>2# <preferred e-mail> <other e-mail 1>
3# <preferred e-mail> <other e-mail 2>
4<anotherjesse@gmail.com> <jesse@dancelamb>
5<anotherjesse@gmail.com> <jesse@gigantor.local>
6<anotherjesse@gmail.com> <jesse@ubuntu>
7<ant@openstack.org> <amesserl@rackspace.com>
8<Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
9<brian.lamar@rackspace.com> <brian.lamar@gmail.com>
10<bschott@isi.edu> <bfschott@gmail.com>
11<cbehrens@codestud.com> <chris.behrens@rackspace.com>
12<chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
3<code@term.ie> <github@anarkystic.com>13<code@term.ie> <github@anarkystic.com>
4<code@term.ie> <termie@preciousroy.local>14<code@term.ie> <termie@preciousroy.local>
5<Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>15<corywright@gmail.com> <cory.wright@rackspace.com>
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>16<devin.carlen@gmail.com> <devcamcar@illian.local>
10<ewan.mellor@citrix.com> <emellor@silver>17<ewan.mellor@citrix.com> <emellor@silver>
11<jaypipes@gmail.com> <jpipes@serialcoder>18<jaypipes@gmail.com> <jpipes@serialcoder>
12<anotherjesse@gmail.com> <jesse@dancelamb>19<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
13<anotherjesse@gmail.com> <jesse@gigantor.local>
14<anotherjesse@gmail.com> <jesse@ubuntu>
15<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>20<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>21<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
18<justin@fathomdb.com> <justinsb@justinsb-desktop>22<justin@fathomdb.com> <justinsb@justinsb-desktop>
23<justin@fathomdb.com> <superstack@superstack.org>
24<masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>
19<masumotok@nttdata.co.jp> <root@openstack2-api>25<masumotok@nttdata.co.jp> <root@openstack2-api>
20<masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>26<matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
27<matt.dietz@rackspace.com> <mdietz@openstack>
21<mordred@inaugust.com> <mordred@hudson>28<mordred@inaugust.com> <mordred@hudson>
29<paul@openstack.org> <paul.voccio@rackspace.com>
22<paul@openstack.org> <pvoccio@castor.local>30<paul@openstack.org> <pvoccio@castor.local>
23<paul@openstack.org> <paul.voccio@rackspace.com>31<rconradharris@gmail.com> <rick.harris@rackspace.com>
32<rlane@wikimedia.org> <laner@controller>
33<sleepsonthefloor@gmail.com> <root@tonbuntu>
24<soren.hansen@rackspace.com> <soren@linux2go.dk>34<soren.hansen@rackspace.com> <soren@linux2go.dk>
25<todd@ansolabs.com> <todd@lapex>35<todd@ansolabs.com> <todd@lapex>
26<todd@ansolabs.com> <todd@rubidine.com>36<todd@ansolabs.com> <todd@rubidine.com>
27<vishvananda@gmail.com> <vishvananda@yahoo.com>37<tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
38<ueno.nachi@lab.ntt.co.jp> <nati.ueno@gmail.com>
39<ueno.nachi@lab.ntt.co.jp> <nova@u4>
40<ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp>
28<vishvananda@gmail.com> <root@mirror.nasanebula.net>41<vishvananda@gmail.com> <root@mirror.nasanebula.net>
29<vishvananda@gmail.com> <root@ubuntu>42<vishvananda@gmail.com> <root@ubuntu>
30<sleepsonthefloor@gmail.com> <root@tonbuntu>43<vishvananda@gmail.com> <vishvananda@yahoo.com>
31<rlane@wikimedia.org> <laner@controller>
32<rconradharris@gmail.com> <rick.harris@rackspace.com>
33<corywright@gmail.com> <cory.wright@rackspace.com>
34<ant@openstack.org> <amesserl@rackspace.com>
35<chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
36<justin@fathomdb.com> <superstack@superstack.org>
37<brian.lamar@rackspace.com> <brian.lamar@gmail.com>
3844
=== modified file 'Authors'
--- Authors 2011-02-17 19:38:11 +0000
+++ Authors 2011-02-17 20:30:11 +0000
@@ -3,17 +3,17 @@
3Anthony Young <sleepsonthefloor@gmail.com>3Anthony Young <sleepsonthefloor@gmail.com>
4Antony Messerli <ant@openstack.org>4Antony Messerli <ant@openstack.org>
5Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>5Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
6Brian Waldon <brian.waldon@rackspace.com>
7Bilal Akhtar <bilalakhtar@ubuntu.com>6Bilal Akhtar <bilalakhtar@ubuntu.com>
8Brian Lamar <brian.lamar@rackspace.com>7Brian Lamar <brian.lamar@rackspace.com>
9Brian Schott <bschott@isi.edu> <bfschott@gmail.com>8Brian Schott <bschott@isi.edu>
9Brian Waldon <brian.waldon@rackspace.com>
10Chiradeep Vittal <chiradeep@cloud.com>10Chiradeep Vittal <chiradeep@cloud.com>
11Chmouel Boudjnah <chmouel@chmouel.com>11Chmouel Boudjnah <chmouel@chmouel.com>
12Chris Behrens <cbehrens@codestud.com>12Chris Behrens <cbehrens@codestud.com>
13Christian Berendt <berendt@b1-systems.de>13Christian Berendt <berendt@b1-systems.de>
14Cory Wright <corywright@gmail.com>14Cory Wright <corywright@gmail.com>
15Dan Prince <dan.prince@rackspace.com>
15David Pravec <David.Pravec@danix.org>16David Pravec <David.Pravec@danix.org>
16Dan Prince <dan.prince@rackspace.com>
17Dean Troyer <dtroyer@gmail.com>17Dean Troyer <dtroyer@gmail.com>
18Devin Carlen <devin.carlen@gmail.com>18Devin Carlen <devin.carlen@gmail.com>
19Ed Leafe <ed@leafe.com>19Ed Leafe <ed@leafe.com>
@@ -44,7 +44,7 @@
44Monty Taylor <mordred@inaugust.com>44Monty Taylor <mordred@inaugust.com>
45MORITA Kazutaka <morita.kazutaka@gmail.com>45MORITA Kazutaka <morita.kazutaka@gmail.com>
46Muneyuki Noguchi <noguchimn@nttdata.co.jp>46Muneyuki Noguchi <noguchimn@nttdata.co.jp>
47Nachi Ueno <ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp> <nati.ueno@gmail.com> <nova@u4>47Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
48Naveed Massjouni <naveed.massjouni@rackspace.com>48Naveed Massjouni <naveed.massjouni@rackspace.com>
49Paul Voccio <paul@openstack.org>49Paul Voccio <paul@openstack.org>
50Ricardo Carrillo Cruz <emaildericky@gmail.com>50Ricardo Carrillo Cruz <emaildericky@gmail.com>
@@ -59,7 +59,7 @@
59Thierry Carrez <thierry@openstack.org>59Thierry Carrez <thierry@openstack.org>
60Todd Willey <todd@ansolabs.com>60Todd Willey <todd@ansolabs.com>
61Trey Morris <trey.morris@rackspace.com>61Trey Morris <trey.morris@rackspace.com>
62Tushar Patil <tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>62Tushar Patil <tushar.vitthal.patil@gmail.com>
63Vasiliy Shlykov <vash@vasiliyshlykov.org>63Vasiliy Shlykov <vash@vasiliyshlykov.org>
64Vishvananda Ishaya <vishvananda@gmail.com>64Vishvananda Ishaya <vishvananda@gmail.com>
65Youcef Laribi <Youcef.Laribi@eu.citrix.com>65Youcef Laribi <Youcef.Laribi@eu.citrix.com>