diff options
| author | Loic Dachary <loic-201408@dachary.org> | 2014-10-08 12:11:02 +0200 |
|---|---|---|
| committer | Loic Dachary <loic-201408@dachary.org> | 2014-10-08 12:11:02 +0200 |
| commit | da074f02cdaf9f46fc20ca862e99dfbe49fc3e83 (patch) | |
| tree | 4f941fd9b174f7152b9b4ba603456dda66d7102f | |
| parent | Merge pull request #2665 from yuyuyu101/update-mailmap (diff) | |
| parent | mailmap: João Eduardo Luís name normalization (diff) | |
| download | ceph-da074f02cdaf9f46fc20ca862e99dfbe49fc3e83.tar.xz ceph-da074f02cdaf9f46fc20ca862e99dfbe49fc3e83.zip | |
Merge pull request #2668 from theanalyst/fix/mailmap-again
Fix/mailmap again
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
| -rw-r--r-- | .mailmap | 4 | ||||
| -rw-r--r-- | .organizationmap | 2 | ||||
| -rw-r--r-- | .peoplemap | 1 |
3 files changed, 5 insertions, 2 deletions
@@ -15,7 +15,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> +Andreas Peters <andreas.joachim.peters@cern.ch> <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> Ashish Chandra <ashish.a.chandra@ril.com> <mail.ashishchandra@gmail.com> @@ -72,6 +72,8 @@ João Eduardo Luís <joao.luis@inktank.com> Joao Eduardo Luis <joao.luis@inktank João Eduardo Luís <joao.luis@inktank.com> <joao@inktank.com> João Eduardo Luís <joao.luis@inktank.com> Joao Luis <joao.luis@inktank.com> João Eduardo Luís <joao@redhat.com> <jluis@redhat.com> +João Eduardo Luís <joao@redhat.com> Joao Eduardo Luis <jeclui@gmail.com> +João Eduardo Luís <joao@redhat.com> Joao Eduardo Luis <joao@redhat.com> Joe Buck <jbbuck@gmail.com> <buck@soe.ucsc.edu> John Spray <jspray@redhat.com> john <jspray@redhat.com> John Spray <jspray@redhat.com> <john.spray@redhat.com> diff --git a/.organizationmap b/.organizationmap index 8b98d463b70..da050048fb4 100644 --- a/.organizationmap +++ b/.organizationmap @@ -202,7 +202,7 @@ The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com> The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com> The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com> Ubuntu Kylin <contact@ubuntukylin.com> Li Wang <liwang@ubuntukylin.com> -Unaffiliated <no@organization.net> Abioy Sun <abioy.sun@gmail.com> +Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com> Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com> Unaffiliated <no@organization.net> Ailing Zhang <zhangal1992@gmail.com> Unaffiliated <no@organization.net> Cheng Cheng <ccheng.leo@gmail.com> diff --git a/.peoplemap b/.peoplemap index f9a4952cb0b..7ac58505352 100644 --- a/.peoplemap +++ b/.peoplemap @@ -24,3 +24,4 @@ Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com> John Wilkins <jwilkins@redhat.com> John Wilkins <john.wilkins@inktank.com> Yan, Zheng <zyan@redhat.com> Yan, Zheng <zheng.z.yan@intel.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com> +João Eduardo Luís <joao@redhat.com> João Eduardo Luís <joao.luis@inktank.com> |