Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mailmap updates #6992

Merged
10 commits merged into from Jan 4, 2016
7 changes: 6 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Billy Olsen <billy.olsen@canonical.com> <billy.olsen@gmail.com>
Bo Cai <cai.bo@h3c.com> caibo <cai.bo@h3c.com>
Boris Ranto <branto@redhat.com> branto1 <branto@redhat.com>
Brian Andrus <bandrus@redhat.com> <bandrus+github@gmail.com>
Brian Felton <bjfelton@gmail.com> <bjfelton@gmail.com>
Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de> <Burkhard.Linke@computational.bio.uni-giessen.de>
Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
Expand All @@ -43,7 +44,7 @@ Chen Dihao <tobeg3oogle@gmail.com> tobe <tobeg3oogle@gmail.com>
Chendi Xue <chendi.xue@intel.com> Chendi.Xue <chendi.xue@intel.com>
Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
Cheng Cheng <ccheng.leo@gmail.com> cchengleo <ccheng.leo@gmail.com>
Chris Holcombe <chris.holcombe@nebula.com> cholcombe973 <xfactor973@gmail.com>
Chris Holcombe <chris.holcombe@nebula.com> <xfactor973@gmail.com>
Christian Brunner <christian@brunner-muc.de> <chb@muc.de>
Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gmail.com>
Expand Down Expand Up @@ -100,6 +101,7 @@ Haomai Wang <haomai@xsky.com> <haomai@xsky.io>
Haomai Wang <haomai@xsky.com> <yuyuyu101@163.com>
Hazem Amara <hazem.amara@telecom-bretagne.eu> <hazem@hazem-Inspiron-3537.(none)>
Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
Hervé Rousseau <hroussea@cern.ch> <hroussea@cern.ch>
Holger Macht <hmacht@suse.de> <holger@homac.de>
Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
Expand Down Expand Up @@ -189,6 +191,7 @@ Pete Zaitcev <zaitcev@redhat.com> <zaitcev@kotori.zaitcev.us>
Pierre Chaumont <pierre.chaumont31@gmail.com> <pierre.chaumont31@gmail.com>
Qiankun Zheng <zheng.qiankun@h3c.com> <zheng.qiankun@h3c.com>
Radoslaw Zarzynski <rzarzynski@mirantis.com> <rzarzynski@github.com>
Rahul Aggarwal <rahul.1aggarwal@gmail.com> <rahul.1aggarwal@gmail.com>
Ren Huanwen <ren.huanwen@zte.com.cn> renhwztetecs <rhwlyw@163.com>
Riccardo Ferretti <rferrett@soe.ucsc.edu> rferrett <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
Expand Down Expand Up @@ -251,13 +254,15 @@ Thomas Cantin <thomas.cantin@telecom-bretagne.eu> ThomasCantin
Thomas Johnson <NTmatter@gmail.com> <thomas.johnson@180amsterdam.com>
Thomas Laumondais <thomas.laumondais@gmail.com> <LSWS0275@EB-OR6251090.toulouse.francetelecom.fr>
Tianshan Qu <tianshan@xsky.com> <qutianshan@gmail.com>
Tobias Suckow <tobias@suckow.biz> <tobias@suckow.biz>
Tommi Virtanen <tv@inktank.com> <tommi.virtanen@dreamhost.com>
Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
Travis Rhoden <trhoden@redhat.com> <trhoden@gmail.com>
Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
Valentin Arshanes Thomas <valentin.arshanes.thomas@gmail.com> <valentin.arshanes.thomas@gmail.com>
Varada Kari <varada.kari@sandisk.com> <kariraja@yahoo.com>
Vasu Kulkarni <vasu.kulkarni@gmail.com> <vasu.kulkarni@gmail.com>
Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
Walter Huf <hufman@gmail.com> Walter J. Huf <hufman@gmail.com>
Expand Down
8 changes: 8 additions & 0 deletions .organizationmap
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ DreamHost <contact@dreamhost.com> Wesley Spikes <wesley.spikes@dreamhost.com>
Dtdream <contact@dtdream.com> Li Peng <lip@dtdream.com>
Dtdream <contact@dtdream.com> weiqian <weiq@dtdream.com>
Dtdream <contact@dtdream.com> Wei Qian <weiq@dtdream.com>
Ebay <contact@ebay.com> Chengyuan Li <chengyli@ebay.com>
Ebay <contact@ebay.com> You Ji <youji@ebay.com>
École polytechnique fédérale de Lausanne <contact@epfl.ch> Stefan Eilemann <Stefan.Eilemann@epfl.ch>
eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
Expand All @@ -91,6 +92,7 @@ Fujitsu <contact@fujitsu.com> Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Fujitsu <contact@fujitsu.com> Shotaro Kawaguchi <kawaguchi.s@jp.fujitsu.com>
Fujitsu <contact@fujitsu.com> Takanori Nakao <nakao.takanori@jp.fujitsu.com>
Fujitsu <contact@fujitsu.com> Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
Gaikai <contact@gaikai.com> David Coles <dcoles@gaikai.com>
GameServers.com <contact@gameservers.com> Brian Rak <dn@devicenull.org>
Gentoo <contact@gentoo.org> Kacper Kowalik <xarthisius@gentoo.org>
Gentoo <contact@gentoo.org> Robin H. Johnson <robbat2@gentoo.org>
Expand Down Expand Up @@ -147,6 +149,7 @@ Huazhong University of Science and Technology <contact@hust.edu.cn> runsisi <run
Igalia <contact@igalia.com> Javier M. Mellid <jmunhoz@igalia.com>
Igalia <contact@igalia.com> Juan A. Suarez Romero <jasuarez@igalia.com>
Imagination Technologies Ltd. <contact@imgtec.com> Alistair Strachan <alistair.strachan@imgtec.com>
IO <contact@io.com> Joe Julian <jjulian@io.com>
iNic <contact@inic.no> Bjørnar Ness <bjornar.ness@gmail.com>
Inktank <contact@inktank.com> Alexandre Marangone <alexandre.marangone@inktank.com>
Inktank <contact@inktank.com> Alex Elder <elder@inktank.com>
Expand Down Expand Up @@ -350,6 +353,7 @@ Unaffiliated <no@organization.net> Arthur Gorjux <arthurgorjux@gmail.com>
Unaffiliated <no@organization.net> BJ Lougee <almightybeeij@gmail.com>
Unaffiliated <no@organization.net> Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de>
Unaffiliated <no@organization.net> Bosse Klykken <larkly@gmail.com>
Unaffiliated <no@organization.net> Brian Felton <bjfelton@gmail.com>
Unaffiliated <no@organization.net> Cheng Cheng <ccheng.leo@gmail.com>
Unaffiliated <no@organization.net> Christos Stavrakakis <stavr.chris@gmail.com>
Unaffiliated <no@organization.net> Claire Massot <claire.massot93@gmail.com>
Expand Down Expand Up @@ -387,6 +391,7 @@ Unaffiliated <no@organization.net> Jean-Rémi Deveaux <jeanremi.deveaux@gmail.co
Unaffiliated <no@organization.net> Jeff Epstein <jepst79@gmail.com>
Unaffiliated <no@organization.net> Jeff Weber <jweber@cofront.net>
Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
Unaffiliated <no@organization.net> Jianhui Yuan <zuiwanyuan@gmail.com>
Unaffiliated <no@organization.net> Jiantao He <hejiantao5@gmail.com>
Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
Unaffiliated <no@organization.net> Jiaying Ren <mikulely@gmail.com>
Expand Down Expand Up @@ -417,6 +422,7 @@ Unaffiliated <no@organization.net> Nishtha Rai <nishtha3rai@gmail.com>
Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9>
Unaffiliated <no@organization.net> oddomatik <bandrus+github@gmail.com>
Unaffiliated <no@organization.net> Pierre Chaumont <pierre.chaumont31@gmail.com>
Unaffiliated <no@organization.net> Rahul Aggarwal <rahul.1aggarwal@gmail.com>
Unaffiliated <no@organization.net> ritz303 <ritz_303@yahoo.com>
Unaffiliated <no@organization.net> Robin Dehu <robindehu@gmail.com>
Unaffiliated <no@organization.net> Robin Tang <robintang974@gmail.com>
Expand All @@ -433,8 +439,10 @@ Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
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>
Unaffiliated <no@organization.net> Tobias Suckow <tobias@suckow.biz>
Unaffiliated <no@organization.net> Valentin Arshanes Thomas <valentin.arshanes.thomas@gmail.com>
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> Volker Voigt <volker.voigt@1und1.de>
Expand Down