Skip to content

Commit

Permalink
Merge pull request #8522 from swamireddy/10.1.1-mailmap
Browse files Browse the repository at this point in the history
mailmap update

Reviewed-by: Loic Dachary <ldachary@redhat.com>
  • Loading branch information
Loic Dachary committed Apr 10, 2016
2 parents 871cd5a + a651598 commit b474652
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .mailmap
Expand Up @@ -131,6 +131,7 @@ Jeffrey Lu <lzhng2000@aliyun.com>
Jeffrey Lu <lzhng2000@aliyun.com> <lzhng2000@hotmail.com>
Jenkins <jenkins@ceph.com> <jenkins-build@jenkins-slave-wheezy.localdomain>
Jenkins <jenkins@ceph.com> Jenkins <jenkins@inktank.com>
Jenkins <jenkins@ceph.com> <jenkins-build@trusty-small-unique--5c6e9c4e-81af-43d3-957d-c650c692c441.localdomain>
Jenkins <jenkins@ceph.com> <jenkins-build@trusty-small-unique--e64d6d03-305d-46bd-9a2c-9b546e06937e.localdomain>
Jiang Heng <jiangheng0511@gmail.com>
Jiantao He <hejiantao5@gmail.com>
Expand Down Expand Up @@ -182,6 +183,7 @@ Loic Dachary <loic@dachary.org>
Loic Dachary <loic@dachary.org> <loic@dachary.com>
Lucas Fantinel <lucas.fantinel@gmail.com>
Lu Shi <shi.lu@h3c.com>
Luo Kexue <luo.kexue@zte.com.cn> scienceluo <luo.kexue@zte.com.cn>
Luo Kexue <luo.kexue@zte.com.cn> <scienceluo@qq.com>
Ma Jianpeng <jianpeng.ma@intel.com>
Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
Expand Down
8 changes: 8 additions & 0 deletions .organizationmap
Expand Up @@ -85,6 +85,7 @@ Dtdream <contact@dtdream.com> Li Peng <lip@dtdream.com>
Dtdream <contact@dtdream.com> Wei Qian <weiq@dtdream.com>
Eayun <contact@eayun.com> Dunrong Huang <dunrong.huang@eayun.com>
Ebay <contact@ebay.com> Chengyuan Li <chengyli@ebay.com>
Ebay <contact@ebay.com> Xiaoxi Chen <xiaoxchen@ebay.com>
Ebay <contact@ebay.com> You Ji <youji@ebay.com>
Ebay <contact@ebay.com> Emile Snyder <emsnyder@ebay.com>
École polytechnique fédérale de Lausanne <contact@epfl.ch> Stefan Eilemann <Stefan.Eilemann@epfl.ch>
Expand Down Expand Up @@ -234,6 +235,7 @@ Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eesto
Mellanox <contact@mellanox.com> Avner BenHanoch <avnerb@mellanox.com>
Mellanox <contact@mellanox.com> Vu Pham <vu@mellanox.com>
Mellanox <contact@mellanox.com> Roi Dayan <roid@mellanox.com>
Mevoco <contact@mevoco.com> Star Guo <star.guo@mevoco.com>
Mirantis <contact@mirantis.com> Adam Kupczyk <akupczyk@mirantis.com>
Mirantis <contact@mirantis.com> Alexey Sheplyakov <asheplyakov@mirantis.com>
Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
Expand Down Expand Up @@ -273,6 +275,7 @@ Red Hat <contact@redhat.com> David Zafman <dzafman@redhat.com>
Red Hat <contact@redhat.com> Douglas Fuller <dfuller@redhat.com>
Red Hat <contact@redhat.com> Erwan Velu <erwan@redhat.com>
Red Hat <contact@redhat.com> Federico Simoncelli <fsimonce@redhat.com>
Red Hat <contact@redhat.com> Ira Cooper <ira@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> Gregory Meno <gmeno@redhat.com>
Expand Down Expand Up @@ -305,6 +308,7 @@ Red Hat <contact@redhat.com> Orit Wasserman <owasserm@redhat.com>
Red Hat <contact@redhat.com> Patrick McGarry <pmcgarry@redhat.com>
Red Hat <contact@redhat.com> Pete Zaitcev <zaitcev@redhat.com>
Red Hat <contact@redhat.com> Petr Machata <pmachata@redhat.com>
Red Hat <contact@redhat.com> Richard W.M. Jones <rjones@redhat.com>
Red Hat <contact@redhat.com> Ross Turk <rturk@redhat.com>
Red Hat <contact@redhat.com> Sage Weil <sweil@redhat.com>
Red Hat <contact@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>
Expand Down Expand Up @@ -484,6 +488,7 @@ Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9
Unaffiliated <no@organization.net> oddomatik <bandrus+github@gmail.com>
Unaffiliated <no@organization.net> Patrick Donnelly <batrick@batbytes.com>
Unaffiliated <no@organization.net> Pierre Chaumont <pierre.chaumont31@gmail.com>
Unaffiliated <no@organization.net> Qinghua Jin <qhjin_dev@163.com>
Unaffiliated <no@organization.net> Rachana Patel <rachana83.patel@gmail.com>
Unaffiliated <no@organization.net> Rahul Aggarwal <rahul.1aggarwal@gmail.com>
Unaffiliated <no@organization.net> Robin Dehu <robindehu@gmail.com>
Expand All @@ -502,6 +507,7 @@ Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
Unaffiliated <no@organization.net> Simon Guinot <simon.guinot@sequanux.org>
Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
Unaffiliated <no@organization.net> sunspot <sunspot0105@gmail.com>
Unaffiliated <no@organization.net> Thomas Johnson <ntmatter@gmail.com>
Unaffiliated <no@organization.net> Thomas Laumondais <thomas.laumondais@gmail.com>
Unaffiliated <no@organization.net> Tim Freund <tim@freunds.net>
Expand All @@ -511,6 +517,7 @@ Unaffiliated <no@organization.net> Vartika Rai <vartikarai17@gmail.com>
Unaffiliated <no@organization.net> Vasu Kulkarni <vasu.kulkarni@gmail.com>
Unaffiliated <no@organization.net> Vicente Cheng <freeze.bilsted@gmail.com>
Unaffiliated <no@organization.net> Viktor Suprun <popsul1993@gmail.com>
Unaffiliated <no@organization.net> Vitja Makarov <vitja.makarov@gmail.com>
Unaffiliated <no@organization.net> Volker Voigt <volker.voigt@1und1.de>
Unaffiliated <no@organization.net> VRan Liu <gliuwr@gmail.com>
Unaffiliated <no@organization.net> Wei Jin <wjin.cn@gmail.com>
Expand All @@ -535,6 +542,7 @@ UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.co
UnitedStack <contact@unitedstack.com> Jevon Qiao <qiaojianfeng@unitedstack.com>
UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
UnitedStack <contact@unitedstack.com> Li Tianqing <tianqing@unitedstack.com>
UnitedStack <contact@unitedstack.com> Ning Yao <yaoning@unitedstack.com>
UnitedStack <contact@unitedstack.com> Yankun Li <liyankun@unitedstack.com>
University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>
Expand Down

0 comments on commit b474652

Please sign in to comment.