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