import Ceph Pacific 16.2.4

[ceph.git] / ceph / .peoplemap

diff --git a/ceph/.peoplemap b/ceph/.peoplemap
index 6dcd0eedeea3d1fa89c7ce9ccdd8bc15466b5e04..d4af1bb5507824e108259cbe4bccd280a8bc9e88 100644 (file)
--- a/ceph/.peoplemap
+++ b/ceph/.peoplemap
@@ -17,10 +17,12 @@
 # git log --pretty='%aN <%aE>' $range | git -c mailmap.file=.peoplemap check-mailmap --stdin | sort | uniq | sed -e 's/\(.*\) \(<.*\)/\2 \1/' | uniq --skip-field=1 --all-repeated | sed -e 's/\(.*>\) \(.*\)/\2 \1/'
 #
 Abhishek Lekshmanan <abhishek@suse.com> Abhishek Lekshmanan <abhishek.lekshmanan@ril.com> 
+Adam Kupczyk <akupczyk@redhat.com> <akupczyk@mirantis.com>
 Alexandre Marangone <amarango@redhat.com> Alexandre Marangone <alexandre.marangone@inktank.com>
 Alfredo Deza <adeza@redhat.com> Alfredo Deza <alfredo.deza@inktank.com>
 Dan Mick <dmick@redhat.com> Dan Mick <dan.mick@inktank.com>
 David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
+Florian Haas <florian@citynetwork.eu> Florian Haas <florian@hastexo.com>
 Greg Farnum <gfarnum@redhat.com> Greg Farnum <greg@inktank.com>
 Gregory Meno <gmeno@redhat.com> <gregory.meno@inktank.com>
 Igor Fedotov <ifedotov@suse.com> Igor Fedotov <ifedotov@mirantis.com>
@@ -32,6 +34,7 @@ John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>
 John Wilkins <jwilkins@redhat.com> John Wilkins <john.wilkins@inktank.com>
 Josh Durgin <jdurgin@redhat.com> Josh Durgin <josh.durgin@inktank.com>
 Ken Dreyer <kdreyer@redhat.com> Ken Dreyer <ken.dreyer@inktank.com>
+Коренберг Марк <mark@ideco.ru> Коренберг Марк <socketpair@gmail.com>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic@dachary.org>
 Mark Nelson <mnelson@redhat.com> Mark Nelson <mark.nelson@inktank.com>
@@ -42,6 +45,8 @@ Neil Levine <nlevine@redhat.com> Neil Levine <neil.levine@inktank.com>
 Noah Watkins <nwatkins@redhat.com> Noah Watkins <noah.watkins@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> Patrick McGarry <patrick@inktank.com>
 Piotr Dałek <piotr.dalek@corp.ovh.com> Piotr Dałek <git@predictor.org.pl> Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Radoslaw Zarzynski <rzarzyns@redhat.com> <rzarzynski@mirantis.com>
+Robin H. Johnson <rjohnson@digitalocean.com> <robin.johnson@dreamhost.com>
 Ross Turk <rturk@redhat.com> Ross Turk <ross.turk@inktank.com>
 Sage Weil <sweil@redhat.com> Sage Weil <sage@inktank.com>
 Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
@@ -49,9 +54,13 @@ Samuel Just <sjust@redhat.com> Samuel Just <sam.just@inktank.com>
 Sandon Van Ness <svanness@redhat.com> Sandon Van Ness <sandon@inktank.com>
 Tamil Muthamizhan <tmuthami@redhat.com> Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
 Tyler Brekke <tbrekke@redhat.com> Tyler Brekke <tyler.brekke@inktank.com>
+Varada Kari <varadaraja.kari@flipkart.com> <varada.kari@sandisk.com>
 Warren Usui <wusui@redhat.com> Warren Usui <warren.usui@inktank.com>
+Wang Song Bo <wangsongbo@cloudin.cn> wangsongbo <wangsongbo@unitedstack.com>
 Yan, Zheng <zyan@redhat.com> Yan, Zheng <zheng.z.yan@intel.com>
 Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>
 Yuri Weinstein <yuriw@redhat.com> Yuri Weinstein <yuri.weinstein@inktank.com>
 Zhi Zhang <zhangz.david@outlook.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
+Zheng Yin <zhengyin@huayun.com> Zheng Yin <zhengyin@chinac.com>
 Patrick Donnelly <pdonnell@redhat.com> Patrick Donnelly <batrick@batbytes.com>
+Myoungwon Oh <myoungwon.oh@samsung.com> Myoungwon Oh <omwmw@sk.com> Myoungwon Oh <ohmyoungwon@gmail.com>