Merge pull request #2273 from dachary/wip-mailmap

mailmap updates
This commit is contained in:
Loic Dachary 2014-08-22 03:05:48 +02:00
commit 5234abfa22
2 changed files with 18 additions and 0 deletions

View File

@ -2,6 +2,7 @@
# See .organizationmap for organization affiliation
#
Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
Abhishek Lekshmanan <abhishek.lekshmanan@ril.com> <abhishek.lekshmanan@gmail.com>
Alexandre Marangone <alexandre.marangone@inktank.com> Alexandre Maragone <alexandre.marangone@inktank.com>
Alexandre Marangone <alexandre.marangone@inktank.com> <a.marangone@gmail.com>
Alexandre Oliva <oliva@gnu.org> <lxoliva@fsfla.org>
@ -10,6 +11,7 @@ Alex Elder <elder@inktank.com> <elder@doink.(none)>
Alex Elder <elder@inktank.com> <elder@dreamhost.com>
Alex Elder <elder@inktank.com> <elder@speedy.(none)>
Alfredo Deza <alfredo.deza@inktank.com> <alfredo@deza.pe>
Andreas Peters <andreas.joachim.peters@cern.ch> Andreas-Joachim Peters <Andreas.Joachim.Peters@cern.ch>
Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
Aristoteles Neto <aristoteles.neto@webdrive.co.nz> <wdneto@users.noreply.github.com>
Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
@ -49,6 +51,7 @@ Greg Farnum <greg@inktank.com> Gregory Farnum <greg@inktank.com>
Guang Yang <yguang@yahoo-inc.com> Guang Yang <yguang@caughtrealize-dl-vm0.peking.corp.yahoo.com>
Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
Holger Macht <hmacht@suse.de> <holger@homac.de>
Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
@ -116,6 +119,8 @@ Samuel Just <sam.just@inktank.com> <samuel.just@inktank.com>
Sandon Van Ness <sandon@inktank.com> SandonV <sandon@inktank.com>
Sebastien Han <sebastien.han@enovance.com> <sebastien.han@enovance.com>
Sebastien Ponce <sebastien.ponce@cern.ch> Sebastien Ponce <Sebastien.Ponce@cern.ch>
Shu, Xinxin <xinxin.shu@intel.com> xinxinsh <xinxin.shu@intel.com>
Shu, Xinxin <xinxin.shu@intel.com> xinxin shu <xinxin.shu@intel.com>
Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
Sushma Gurram <sushma.gurram@sandisk.com> sushma <sushma.gurram@sandisk.com>
Sylvain Munaut <s.munaut@whatever-company.com> <tnt@246tNt.com>
@ -147,3 +152,4 @@ Yehuda Sadeh <yehuda@inktank.com> <yehudasa@gmail.com>
Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda>
Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda.infit.com>
Yehuda Sadeh <ysadey@redhat.com> <yehuda@redhat.com>
Zhiqiang Wang <wonzhq@hotmail.com> Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>

View File

@ -111,8 +111,10 @@ Inktank <contact@inktank.com> Tyler Brekke <tyler.brekke@inktank.com>
Inktank <contact@inktank.com> Warren Usui <warren.usui@inktank.com>
Inktank <contact@inktank.com> Yehuda Sadeh <yehuda@inktank.com>
Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
Intel <contact@intel.com> Shu, Xinxin <xinxin.shu@intel.com>
Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
Intel <contact@intel.com> Xiaoxi Chen <xiaoxi.chen@intel.com>
Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>
IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
@ -132,14 +134,18 @@ Red Hat <contact@redhat.com> Alex Elder <aelder@redhat.com>
Red Hat <contact@redhat.com> Alfredo Deza <adeza@redhat.com>
Red Hat <contact@redhat.com> Dan Mick <dmick@redhat.com>
Red Hat <contact@redhat.com> David Zafman <dzafman@redhat.com>
Red Hat <contact@redhat.com> Federico Simoncelli <fsimonce@redhat.com>
Red Hat <contact@redhat.com> Gary Lowell <glowell@redhat.com>
Red Hat <contact@redhat.com> Greg Farnum <gfarnum@redhat.com>
Red Hat <contact@redhat.com> Huamin Chen <hchen@redhat.com>
Red Hat <contact@redhat.com> Ilya Dryomov <idryomov@redhat.com>
Red Hat <contact@redhat.com> João Eduardo Luís <joao@redhat.com>
Red Hat <contact@redhat.com> John Spray <jspray@redhat.com>
Red Hat <contact@redhat.com> John Wilkins <jwilkins@redhat.com>
Red Hat <contact@redhat.com> Josh Durgin <jdurgin@redhat.com>
Red Hat <contact@redhat.com> Ken Dreyer <kdreyer@redhat.com>
Red Hat <contact@redhat.com> Loic Dachary <loic-201408@dachary.org>
Red Hat <contact@redhat.com> Luis Pabón <lpabon@redhat.com>
Red Hat <contact@redhat.com> Mark Nelson <mnelson@redhat.com>
Red Hat <contact@redhat.com> Neil Levine <nlevine@redhat.com>
Red Hat <contact@redhat.com> Noah Watkins <nwatkins@redhat.com>
@ -153,9 +159,12 @@ Red Hat <contact@redhat.com> Tyler Brekke <tbrekke@redhat.com>
Red Hat <contact@redhat.com> Venky Shankar <vshankar@redhat.com>
Red Hat <contact@redhat.com> Warren Usui <wusui@redhat.com>
Red Hat <contact@redhat.com> Yehuda Sadeh <ysadey@redhat.com>
Reliance Jio Infocomm Ltd. <contact@ril.com> Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roaldvanloon.nl>
Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
SanDisk <contact@sandisk.com> Allen Samuels <allen.samuels@sandisk.com>
SanDisk <contact@sandisk.com> Anand Bhat <anand.bhat@sandisk.com>
SanDisk <contact@sandisk.com> Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
SanDisk <contact@sandisk.com> Somnath Roy <somnath.roy@sandisk.com>
SanDisk <contact@sandisk.com> Sushma Gurram <sushma.gurram@sandisk.com>
Science & Technology Facilities Council <contact@stfc.ac.uk> George Ryall <george.ryall@stfc.ac.uk>
@ -164,6 +173,8 @@ Spectra Logic <contact@spectralogic.com> Alan Somers <asomers@gmail.com>
SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
SUSE <contact@suse.com> Holger Macht <hmacht@suse.de>
SUSE <contact@suse.com> Owen Synge <osynge@suse.com>
SUSE <contact@suse.com> Thorsten Behrens <tbehrens@suse.com>
SWITCH <contact@switch.ch> Jens-Christian Fischer <jens-christian.fischer@switch.ch>
SWITCH <contact@switch.ch> Simon Leinen <simon.leinen@switch.ch>
TCloud Computing <contact@tcloudcomputing.com> CC Lien <cc_lien@tcloudcomputing.com>
@ -190,6 +201,7 @@ Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9
Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
Unaffiliated <no@organization.net> Zhiqiang Wang <wonzhq@hotmail.com>
Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@unilogicnetworks.net>
UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
UnitedStack <contact@unitedstack.com> Haomai Wang <haomaiwang@gmail.com>