From: Abhishek Lekshmanan Date: Wed, 23 May 2018 11:52:07 +0000 (+0200) Subject: mailmap fixes for 12.2.0 X-Git-Tag: v15.0.0~162^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d00e77a440e9a8872a5a4a4c8d09fedc63965f5a;p=ceph.git mailmap fixes for 12.2.0 Signed-off-by: Abhishek Lekshmanan --- diff --git a/.mailmap b/.mailmap index ebda66e6df88..a015d2b2a413 100644 --- a/.mailmap +++ b/.mailmap @@ -11,6 +11,8 @@ Aaron Bassett Abhishek Lekshmanan Abhishek Lekshmanan Adam C. Emerson +Adam Kupczyk +Adam Kupczyk Adam Twardowski Adir Lev Ahoussi Armand @@ -25,6 +27,7 @@ Alex Elder Alex Elder Alexis Normand Alfredo Deza +Amit Kumar Andreas Gerstmayr Andreas Peters Andrew Bartlett @@ -45,6 +48,7 @@ Brian Andrus Brian Felton Brian Rak Burkhard Linke +Jin Cai Caleb Miles Caleb Miles Carlos Maltzahn @@ -60,6 +64,9 @@ Chen Dihao Chendi Xue Chendi Xue Cheng Cheng +Chen Hg +Chen Hg +Fangxian Chen Chu Hua-Rong Chu Hua-Rong Chris Holcombe @@ -81,17 +88,22 @@ Daniel Gryniewicz Dan Mick Dan Mick Dan Mick +Daniel Bar-On Danny Al-Gaaf David Moreau Simard Dennis Schafroth Desmond Shih Desmond Shih +Dingdang Zhang Dmitry Smirnov Dmitry Yatsushkevich Dominik Hannen Donghai Xu Dongmao Zhang Dongsheng Yang +Dongdong Tao +Linpeng Dong +Donglin Peng Edward Yang Enming Zhang Eric Lee @@ -154,7 +166,8 @@ Holger Macht Hongtong Liu Hong Zhangoole Huamin Chen -Huang Jun +Huang Jun +Huang Jun Ignacio Bravo Igor Fedotov Ilja Slepnev @@ -188,6 +201,7 @@ Jiang Heng Jiantao He Jian Wen Jianjian huo +Jiaying Ren Jingkai Yuan Ji Chen Jie Li @@ -225,6 +239,7 @@ Junhui Tang Kacper Kowalik Kanika Murarka Kapil Sharma +Karol Mroz Kefu Chai Kefu Chai Ken Dreyer @@ -239,13 +254,15 @@ Luo Kexue Luo Runbing Luo Runbing Li Hongjie -Li Wang -Li Wang +Li Wang +Lin Bing Linfei Hou Liu Hong Liu Lei +Liu Yuhong Liu Peiyan Li Tianqing +Lin Bing Liu Yang Liuzhong Chen Yankun Li @@ -296,6 +313,8 @@ Neil Levine Nick Fisk Nicolas Yong Ning Tao <63358@sangfor.com> +Nick Erdmann +Nick Erdmann <11783095+nrdmn@users.noreply.github.com> Ning Yao Ning Yao Noah Watkins @@ -309,7 +328,7 @@ Patrick McGarry Pan Liu Pavan Rallabhandi Pavan Rallabhandi -Pengcheng Zhang +Peng Cheng Zhang Pete Zaitcev Petertc Chu Pierre Chaumont @@ -318,8 +337,10 @@ Pritha Srivastava Pritha Srivastava Qiankun Zheng Radoslaw Zarzynski +Radoslaw Zarzynski Rahul Aggarwal Ramakrishnan Periyasamy +Redick Wang Rémi Buisson Ren Huanwen Ren Huanwen @@ -382,6 +403,7 @@ Shotaro Kawaguchi Shanchun Lv Shawn Chen Shehbaz Jaffer +Shengjing Zhu Shinobu Kinjo Shinobu Kinjo Shishir Gowda @@ -433,7 +455,9 @@ Uday Mullangi Valentin Arshanes Thomas Varada Kari Varada Kari +Varada Kari Vasu Kulkarni +Victor Araujo Volker Assmann Volker Assmann Walter Huf @@ -452,12 +476,15 @@ Wei Qian Wenjun Huang Wido den Hollander Wu Xingyi +Wu Mingqiao Wei Qiaomiao +Wu Jian Xan Peng Xavier Roche Xiangwei Wu Xiaowei Chen Xiaowei Chen +Xiaoyan Li Xie Rui <875016668@qq.com> Xie Rui <875016668@qq.com> Xie Xingguo @@ -476,6 +503,7 @@ Yannick Atchy Dalama Yankun Li Yan, Zheng Yan, Zheng +Yan, Zheng Yanchun Bai Yehua Chen Yehua Chen @@ -507,6 +535,7 @@ Yuri Weinstein Yuri Weinstein Yuri Weinstein Yuri Weinstein +Yuli Yang Xianxia Xiao XiaoCheng Wang Xiaofei Cui @@ -519,8 +548,10 @@ Zeqiang Zhuang Zhang Lei Zhang Lei <243290414@qq.com> Zhang Shaowen +Zhang Weibing Zhang Zezhu Zongyou Yao +Gu Zhongyan Guo Zhandong Guo Zhandong <18896723979@139.com> Guo Zhandong @@ -529,6 +560,7 @@ Zhao Kun Zhou Rui Song <236131368@qq.com> Zhou Rui Song <236131368@qq.com> Zhenyu Leng +Zheng Yin Zhi (David) Zhang Zhi (David) Zhang Zhiqiang Wang diff --git a/.organizationmap b/.organizationmap index 8561e1e57744..ebd0eb6713e4 100644 --- a/.organizationmap +++ b/.organizationmap @@ -29,7 +29,9 @@ Acaleph Alistair Israel Alcatel Lucent Joseph McDonald Alcatel Lucent Ker Liu Aliyun Jeffrey Lu +Alibaba Caijin Caij Alibaba James Liu +Alibaba Dingdang Zhang Alibaba Pan Liu Alibaba Jin Cai Alibaba Ming Lin @@ -49,6 +51,10 @@ Bayan Mohammad Salehe BCI Marco Garcês Beezim Florent Manens Bigpoint.com Moritz Möller +Bigtera Guo-Fu Tseng +Bigtera Henry Chang +Bigtera Kuan-Kai Chiu xz +Bigtera Vicente Cheng Budgetenergie Hans van den Bogert Canonical Billy Olsen Canonical Chris Glass @@ -64,23 +70,29 @@ CERN Dan van der Ster CERN Hervé Rousseau CERN Joaquim Rocha CERN Sebastien Ponce -China Mobile donglinpeng +China Mobile Chenfang Xian +China Mobile Donglin Peng China Mobile Gui Hecheng China Mobile Guo Zhandong China Mobile Jing Wenjun China Mobile Li Hongjie China Mobile Liu Hong +China Mobile Liu Yuhong China Mobile lvshuhua +China Mobile Xiubo Li China Mobile Zhang Shaowen +China Mobile Yuli Yang China Mobile wangzhengyong China Unicom Liu Lei Chinac Huan Zhang Chinac Xinxin Shu +Chinac Zheng Yin Choopa, LLC Adam Twardowski Chunghwa Telecom Chu Hua-Rong CISCO Johnu George CISCO Kai Zhang CISCO Roland Mechler +Cloudin Xinying Song Cloudwatt Christophe Courtaut Cloudwatt Florent Flament Cloudwatt Loic Dachary @@ -144,6 +156,7 @@ Easystack Liuzhong Chen Easystack Pengcheng Zhang Easystack Wanlong Gao Easystack Yang Wang +Easystack Peng Cheng Zhang ESPOL Edwin F. Boza Fairbanks Robert Jansen FAU Michael Eischer @@ -162,6 +175,7 @@ Gentoo Robin H. Johnson Gentoo Yixun Lan GNU Alexandre Oliva gocept gmbh & co. kg Christian Theune +GoDaddy Bryan Stillwell Grimmer Lenz Grimmer GRNet Filippos Giannakos GRNet Stratos Psomadakis @@ -269,19 +283,24 @@ Inspur Mingqiao Wu Inspur Sibei Gao Inspur XueYu Bai Inspur Ying He +Inspur Wuming Qiao Intel Anjaneya Chagam Intel Chendi Xue +Intel Chunmei Liu Intel Dave Chen Intel Ganesh Mahalingam Intel Haodong Tang +Intel Jianpeng Ma Intel Jacek J. Łakis Intel Jingkai Yuan Intel Krzysztof Kosiński Intel Ma Jianpeng Intel Orlando Moreno +Intel Tushar Gohad Intel Shu, Xinxin Intel Tushar Gohad Intel Wang, Yaguang +Intel Xiaoyan Li Intel Xiaoxi Chen Intel Yan, Zheng Intel Yuan Zhou @@ -323,7 +342,7 @@ Locator Technologies Kris Jurka Willem Jan Withagen Mellanox Adir Lev Mellanox Avner BenHanoch -Mellanox DanielBar-On +Mellanox Daniel Bar-On Mellanox Oren Duer Mellanox Sarit Zubakov Mellanox Vu Pham @@ -365,6 +384,7 @@ Quadrature Capital Limited Jim Wright Bassam Tabbara Raidix International Marov Aleksey Red Hat Adam C. Emerson +Red Hat Adam Kupczyk Red Hat Alexander Chuzhoy Red Hat Alexandre Marangone Red Hat Alex Elder @@ -387,6 +407,7 @@ Red Hat David Galloway Red Hat David Zafman Red Hat Douglas Fuller Red Hat Ernesto Puerta +Red Hat Eric Ivancich Red Hat Erwan Velu Red Hat Federico Simoncelli Red Hat Frank Filz @@ -426,6 +447,7 @@ Red Hat Mike Hackett Red Hat Milan Broz Red Hat Mehdi Abaakouk Red Hat Neil Levine +Red Hat Neha Ojha Red Hat Nilamdyuti Goswami Red Hat Noah Watkins Red Hat Orit Wasserman @@ -436,6 +458,7 @@ Red Hat Pete Zaitcev Red Hat Petr Lautrbach Red Hat Petr Machata Red Hat Pritha Srivastava +Red Hat Radoslaw Zarzynski Red Hat Ramana Raja Red Hat Ramakrishnan Periyasamy Red Hat Richard W.M. Jones @@ -470,6 +493,7 @@ Reliance Jio Infocomm Ltd. Ashish Chandra Swami Reddy Roald van Loon Consultancy Roald J. van Loon Ruijie Networks Ning Yao +Salesforce Sameer Tiwari Sandia National Laboratories Jim Schutt Samsung James Liu Samsung Jianjian Huo @@ -544,6 +568,7 @@ SUSE Tim Serong SUSE Volker Theile SWITCH Jens-Christian Fischer SWITCH Simon Leinen +Synesis Aleksei Gutikov T2Cloud Leo Zhang TCloud Computing CC Lien TCloud Computing Henry C Chang @@ -553,6 +578,7 @@ Telecom Bretagne Ahoussi Armand Baptiste Veuillez Telecom Bretagne Hazem Amara Telecom Bretagne Thomas Cantin +Tencent Redick Wang Tencent Wei Luo Tencent Wenjun Huang Tencent Zhi Zhang @@ -561,6 +587,7 @@ Tencent Cloud Jing Chen Tencent Cloud Shanchun Lv Tencent Cloud Zongyou Yao Teradata Nitin A Kamble +Tera Giovani Rinaldi The Linux Box Adam C. Emerson The Linux Box Ali Maredia The Linux Box Casey Bodley @@ -571,7 +598,7 @@ Trendy Tech shiqi Trendy Tech Zhang Lei Uber Technologies Inc. Henrik Korkuc Ubuntu Kylin Min Chen -UMCloud Jiaying Ren +UMCloud Jiaying Ren UMCloud Rongze Zhu UMCloud Enming Zhang UMCloud Shengjing Zhu @@ -582,8 +609,10 @@ Unaffiliated Accela Zhao Unaffiliated Adam Twardowski Unaffiliated Ailing Zhang Unaffiliated Alan Grosskurth +Unaffiliated Alessandro Barbieri Unaffiliated Alexis Normand Unaffiliated Amir Vadai +Unaffiliated Andrew Shewmaker Unaffiliated Andy Allan Unaffiliated Anirudha Bose Unaffiliated Anis Ayari @@ -599,6 +628,7 @@ Unaffiliated craigchi Unaffiliated Charles Alva Unaffiliated Chanyoung Park Unaffiliated Cheng Cheng +Unaffiliated Chen Hg Unaffiliated Christos Stavrakakis Unaffiliated Claire Massot Unaffiliated Clement Lebrun @@ -612,6 +642,7 @@ Unaffiliated Dennis Schafroth Unaffiliated Ding Dinghua Unaffiliated Diwakar Goel Unaffiliated Dominik Hannen +Unaffiliated Dongdong Tao Unaffiliated Drunkard Zhang Unaffiliated Dunrong Huang Unaffiliated Edgaras Lukosevicius @@ -631,6 +662,7 @@ Unaffiliated François Lafont Unaffiliated Frank S. Filz Unaffiliated Frank Yu Unaffiliated Gabriel Sentucq +Unaffiliated Gu Zhongyan Unaffiliated haodong.tang Unaffiliated Harald Klein Unaffiliated Hector Martin @@ -667,6 +699,9 @@ Unaffiliated Jianhui Yuan Unaffiliated Jiantao He Unaffiliated Jian Wen Unaffiliated Jiaying Ren +Unaffiliated Jianyu Li +Unaffiliated Jeff Green +Unaffiliated Jeegn Chen Unaffiliated John Coyle Unaffiliated John Lin Unaffiliated Jon Bernard @@ -686,6 +721,8 @@ Unaffiliated koleosfuscus Unaffiliated Kyr Shatskyy Unaffiliated Laurent Guerby Unaffiliated Lee Revell +Unaffiliated Lin Bing +Unaffiliated Logan Blyth Unaffiliated Lucas Fantinel Unaffiliated Коренберг Марк Unaffiliated Matt Richards @@ -697,7 +734,9 @@ Unaffiliated Michael Riederer Unaffiliated Michael Sevilla Unaffiliated Michal Jarzabek Unaffiliated Mykola Golub +Unaffiliated mychoxin Unaffiliated Neha Ummareddy +Unaffiliated Nick Erdmann Unaffiliated Nick Fisk Unaffiliated Nicolas Yong Unaffiliated Nishtha Rai @@ -708,6 +747,7 @@ Unaffiliated optimistyzy Unaffiliated Pascal Bach Unaffiliated Patrick Dinnen Unaffiliated Patrick Donnelly +Unaffiliated Peng Zhang Unaffiliated Peter Maloney Unaffiliated Petertc Chu Unaffiliated Pierre Chaumont @@ -733,11 +773,14 @@ Unaffiliated Shang Ding Unaffiliated Shanggao Qiu Unaffiliated Shawn Chen Unaffiliated Shawn Edwards +Unaffiliated Shengjing Zhu Unaffiliated Simon Guinot +Unaffiliated Spandan Kumar Sahu Unaffiliated Stephen F Taylor Unaffiliated Steve Stock Unaffiliated Taeksang Kim Unaffiliated Tahia Khan +Unaffiliated Ted-Chang Unaffiliated Thomas Johnson Unaffiliated Thomas Laumondais Unaffiliated Tim Freund @@ -747,26 +790,31 @@ Unaffiliated Valentin Arshanes Thomas Vartika Rai Unaffiliated Vasu Kulkarni Unaffiliated Vicente Cheng +Unaffiliated Victor Araujo Unaffiliated Viktor Suprun Unaffiliated Vitja Makarov Unaffiliated Vladislav Odintsov Unaffiliated Volker Voigt Unaffiliated VRan Liu Unaffiliated William A. Kennington III +Unaffiliated Wu Jian Unaffiliated Xan Peng Unaffiliated Xie Rui <875016668@qq.com> Unaffiliated Xingyi Wu Unaffiliated Xinze Chi Unaffiliated Xiong Yiliang Unaffiliated Xu Biao +Unaffiliated Xuehan Xu Unaffiliated Yang Honggang Unaffiliated Yann Dupont Unaffiliated Yannick Atchy Dalama +Unaffiliated Yanhu Cao Unaffiliated Yao Zongyou Unaffiliated Yatin Kumbhare Unaffiliated YiQiang Chen Unaffiliated Yongyue Sun Unaffiliated You Ji +Unaffiliated Zhang Lei <243290414@qq.com> Unaffiliated Zhang Shaowen Unaffiliated Weibing Zhang Unaffiliated Zhao Junwang @@ -774,6 +822,7 @@ Unaffiliated Zhao Kun Unaffiliated Zhe Zhang Unaffiliated Zhicheng Wei Unaffiliated Zhou Rui Song <236131368@qq.com> +Unaffiliated Zhou Zhengping Unaffiliated Zhuang Xiaochun Unilogic Networks B.V Pascal de Bruijn UnitedStack Chen Dihao @@ -785,6 +834,7 @@ UnitedStack Li Tianqing UnitedStack Ning Yao UnitedStack wangsongbo UnitedStack Yankun Li +UnitedStack Zhang Weibing University of California, Santa Cruz Adam Crume University of California, Santa Cruz Andrew Leung University of California, Santa Cruz Carlos Maltzahn @@ -800,6 +850,7 @@ University of Maryland Padraig O'Sullivan University of Toronto Shehbaz Jaffer University of Utah Xing Lin Virtuozzo Andrey Parfenov +Viva64 Svyatoslav VRT Stuart Longland Walmart Labs Pavan Rallabhandi Walmart Labs Sirisha Guduru @@ -811,6 +862,7 @@ Wido 42on Wido den Hollander Wikia Lukasz Jagiello X-ION Mouad Benchchaoui X-ION Stephan Renatus +XSky Huang Jun XSky hechuang XSky Haomai Wang XSky He Chuang @@ -820,6 +872,7 @@ XSky Tianshan Qu XSky Xinze Chi XSky Zhiqiang Wang XTao Co. Ltd. Yunfei Guan +XTao Co. Ltd. Peng Xie Yahoo! Guang Yang Yahoo! Haifeng Liu Yahoo! Lei Dong @@ -828,12 +881,15 @@ Yahoo! Wei Luo Yahoo! Xihui He Yahoo! Zhi (David) Zhang YouScribe Guilhem Lettron +X-ion GmbH Jens Rosenboom ZTE Chuanhong Wang +ZTE clove ZTE Gong Chuang ZTE Lan De ZTE Luo Kexue ZTE Luo Runbing ZTE Ren Huanwen +ZTE Shun Song ZTE Song Baisen ZTE Song Shun ZTE Song Weibin diff --git a/.peoplemap b/.peoplemap index 6dcd0eedeea3..c34c19b9ce4f 100644 --- a/.peoplemap +++ b/.peoplemap @@ -17,6 +17,7 @@ # 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 Lekshmanan +Adam Kupczyk Alexandre Marangone Alexandre Marangone Alfredo Deza Alfredo Deza Dan Mick Dan Mick @@ -42,6 +43,7 @@ Neil Levine Neil Levine Noah Watkins Noah Watkins Patrick McGarry Patrick McGarry Piotr Dałek Piotr Dałek Piotr Dałek +Radoslaw Zarzynski Ross Turk Ross Turk Sage Weil Sage Weil Sahid Orentino Ferdjaoui Sahid Orentino Ferdjaoui