Skip to content

Commit

Permalink
Merge pull request ceph#3075 from theanalyst/doc/v0.89/mailmap
Browse files Browse the repository at this point in the history
mailmap updates

Reviewed-by: Loic Dachary <[email protected]>
  • Loading branch information
ldachary committed Dec 15, 2014
2 parents ee10896 + f0961ae commit a58385a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Caleb Miles <[email protected]> caleb miles <[email protected]>
Caleb Miles <[email protected]> Caleb Miles <[email protected]>
Casey Marshall <[email protected]> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
Carlos Maltzahn <[email protected]> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
Chendi Xue <[email protected]> Chendi Xue <[email protected]>
Chendi Xue <[email protected]> Chendi.Xue <[email protected]>
Cheng Cheng <[email protected]> cchengleo <[email protected]>
Christian Brunner <[email protected]> <[email protected]>
Christian Marie <[email protected]> <[email protected]>
Expand All @@ -33,7 +35,8 @@ Colin P. McCabe <[email protected]> <[email protected]>
Colin P. McCabe <[email protected]> <[email protected]>
Dan Chai <[email protected]> danchai <[email protected]>
Dan Mick <[email protected]> <[email protected]>
Dan Mick <[email protected]> <[email protected]>
Dan Mick <[email protected]> <[email protected]>
Dan Mick <[email protected]> <[email protected]>
Danny Al-Gaaf <[email protected]> <[email protected]>
David Moreau Simard <[email protected]> <[email protected]>
Dmitry Smirnov <[email protected]> <[email protected]>
Expand Down Expand Up @@ -145,6 +148,7 @@ Samuel Just <[email protected]> <[email protected]>
Samuel Just <[email protected]> <[email protected]>
Scott A. Brandt <[email protected]> sbrandt <sbrandt@29311d96-e01e-0410-9327-a35deaab8ce9>
Sandon Van Ness <[email protected]> SandonV <[email protected]>
Sandon Van Ness <[email protected]> <[email protected]>
Sebastien Han <[email protected]> <[email protected]>
Sebastien Ponce <[email protected]> Sebastien Ponce <[email protected]>
Shu, Xinxin <[email protected]> xinxinsh <[email protected]>
Expand Down
10 changes: 10 additions & 0 deletions .organizationmap
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ GRNet <[email protected]> Vangelis Koukis <[email protected]>
Hastexo <[email protected]> Florian Haas <[email protected]>
HGST <[email protected]> Kevin Dalley <[email protected]>
HGST <[email protected]> Lluis Pamies-Juarez <[email protected]>
HP <[email protected]> Blaine Gardner <[email protected]>
Hostplex Hosting <[email protected]> Andras Elso <[email protected]>
iNic <[email protected]> Bjørnar Ness <[email protected]>
Inktank <[email protected]> Alexandre Marangone <[email protected]>
Expand Down Expand Up @@ -164,6 +165,7 @@ Red Hat <[email protected]> Loic Dachary <[email protected]>
Red Hat <[email protected]> Luis Pabón <[email protected]>
Red Hat <[email protected]> Mark Nelson <[email protected]>
Red Hat <[email protected]> Neil Levine <[email protected]>
Red Hat <[email protected]> Nilamdyuti Goswami <[email protected]>
Red Hat <[email protected]> Noah Watkins <[email protected]>
Red Hat <[email protected]> Patrick McGarry <[email protected]>
Red Hat <[email protected]> Ross Turk <[email protected]>
Expand Down Expand Up @@ -192,9 +194,11 @@ SanDisk <[email protected]> Sushma Gurram <[email protected]>
Science & Technology Facilities Council <[email protected]> George Ryall <[email protected]>
SendFaster <[email protected]> Christopher O'Connell <[email protected]>
Spectra Logic <[email protected]> Alan Somers <[email protected]>
SUSE <[email protected]> Adam Spiers <[email protected]>
SUSE <[email protected]> David Disseldorp <[email protected]>
SUSE <[email protected]> Hannes Reinecke <[email protected]>
SUSE <[email protected]> Holger Macht <[email protected]>
SUSE <[email protected]> Karl Eichwalder <[email protected]>
SUSE <[email protected]> Owen Synge <[email protected]>
SUSE <[email protected]> Thorsten Behrens <[email protected]>
SWITCH <[email protected]> Jens-Christian Fischer <[email protected]>
Expand All @@ -216,7 +220,9 @@ Unaffiliated <[email protected]> Cheng Cheng <[email protected]>
Unaffiliated <[email protected]> Daniel Schepler <[email protected]>
Unaffiliated <[email protected]> Colin Mattson <[email protected]>
Unaffiliated <[email protected]> Dan Chai <[email protected]>
Unaffiliated <[email protected]> Ding Dinghua <[email protected]>
Unaffiliated <[email protected]> Dominik Hannen <[email protected]>
Unaffiliated <[email protected]> Dongmao Zhang <[email protected]>
Unaffiliated <[email protected]> Erik Logtenberg <[email protected]>
Unaffiliated <[email protected]> Federico Gimenez <[email protected]>
Unaffiliated <[email protected]> Florent Bautista <[email protected]>
Expand All @@ -225,10 +231,12 @@ Unaffiliated <[email protected]> Huang Jun <[email protected]>
Unaffiliated <[email protected]> Jiang Heng <[email protected]>
Unaffiliated <[email protected]> Janne Grunau <[email protected]>
Unaffiliated <[email protected]> Jiantao He <[email protected]>
Unaffiliated <[email protected]> Kefu Chai <[email protected]>
Unaffiliated <[email protected]> Kevin Cox <[email protected]>
Unaffiliated <[email protected]> koleosfuscus <[email protected]>
Unaffiliated <[email protected]> Laurent Guerby <[email protected]>
Unaffiliated <[email protected]> Mehdi Abaakouk <[email protected]>
Unaffiliated <[email protected]> Michal Jarzabek <[email protected]>
Unaffiliated <[email protected]> Michael Nelson <[email protected]>
Unaffiliated <[email protected]> Michael Riederer <[email protected]>
Unaffiliated <[email protected]> (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9>
Expand All @@ -240,6 +248,7 @@ Unaffiliated <[email protected]> Volker Voigt <[email protected]>
Unaffiliated <[email protected]> VRan Liu <[email protected]>
Unaffiliated <[email protected]> William A. Kennington III <[email protected]>
Unaffiliated <[email protected]> xan <[email protected]>
Unaffiliated <[email protected]> Xinze Chi <[email protected]>
Unaffiliated <[email protected]> Yann Dupont <[email protected]>
Unilogic Networks B.V <[email protected]> Pascal de Bruijn <[email protected]>
UnitedStack <[email protected]> Guangliang Zhao <[email protected]>
Expand Down Expand Up @@ -268,6 +277,7 @@ X-ION <[email protected]> Mouad Benchchaoui <[email protected]>
X-ION <[email protected]> Stephan Renatus <[email protected]>
Yahoo! <[email protected]> Guang Yang <[email protected]>
Yahoo! <[email protected]> Haifeng Liu <[email protected]>
Yahoo! <[email protected]> Lei Dong <[email protected]>
Yahoo! <[email protected]> Ray Lv <[email protected]>
Yahoo! <[email protected]> Wei Luo <[email protected]>
Yahoo! <[email protected]> Xihui He <[email protected]>
Expand Down

0 comments on commit a58385a

Please sign in to comment.