From d9ea1686f1f6fbb64e1f4ac1d632e5bc300137aa Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sun, 15 Mar 2015 23:22:13 +0000 Subject: [PATCH] Some sanitization work on .mailmap, .organizationmap, .peoplemap : Sorting , Duplicate removal Signed-off-by: Yann Dupont --- .mailmap | 72 ++++++++++++++++++++++++------------------------ .organizationmap | 52 +++++++++++++++++----------------- .peoplemap | 7 ++--- 3 files changed, 64 insertions(+), 67 deletions(-) diff --git a/.mailmap b/.mailmap index d95ca13c36025..4f67da5a22451 100644 --- a/.mailmap +++ b/.mailmap @@ -5,8 +5,10 @@ # See .organizationmap for organization affiliation # See .peoplemap for unique list of people # -Ailing Zhang +# Abhishek Lekshmanan +Ahoussi Armand delco225 +Ailing Zhang Alexandre Marangone Alexandre Maragone Alexandre Marangone Alexandre Oliva @@ -18,20 +20,19 @@ Alfredo Deza Andreas Peters Andrew Bartlett Andrew Bartlett Andrew Leung anwleung -Ahoussi Armand delco225 +Anis Ayari Anols Aristoteles Neto Ashish Chandra -Anis Ayari Anols Baptiste Veuillez -Brian Rak devicenull Billy Olsen +Brian Rak devicenull Caleb Miles caleb miles Caleb Miles caleb miles Caleb Miles Caleb Miles -Casey Marshall rsdio Carlos Maltzahn carlosm -Chendi Xue Chendi Xue +Casey Marshall rsdio Chendi Xue Chendi.Xue +Chendi Xue Chendi Xue Cheng Cheng cchengleo Chris Holcombe cholcombe973 Christian Brunner @@ -41,81 +42,80 @@ Colin P. McCabe Colin P. McCabe Dan Chai danchai Dan Mick -Dan Mick Dan Mick +Dan Mick Danny Al-Gaaf David Moreau Simard -Zhi (David) Zhang Dmitry Smirnov Dominik Hannen Dominik Hannen Eric Mourgaya Erwin, Brock A Esteban Molina-Estolano eestolan -François Lafont François Lafont -Florian Coste nairolf21 +Federico Gimenez fgimenez +Feng Wang cyclonew Florent Bautista FlorentCoppint Florent Flament -Federico Gimenez fgimenez +Florian Coste nairolf21 +François Lafont François Lafont Gary Lowell Gary Lowelll Gary Lowell Gary Lowell Gerben Meijer Greg Farnum +Greg Farnum Greg Farnum Greg Farnu Greg Farnum Greg Farnum Greg Farnum -Greg Farnum Greg Farnum Greg Farnum Gregory Farnum Greg Farnum Reviewed-by: Greg Farnum Guang Yang Guang Yang Guang Yang Guilhem Lettron -Feng Wang cyclonew Hazem Amara -Huamin Chen rootfs Henry C Chang Holger Macht +Huamin Chen rootfs Huang Jun huang jun Huang Jun huangjun Ilya Dryomov -Jian Wen Jiang Heng jiangheng Jiantao He hejiantao5 -João Eduardo Luís +Jian Wen João Eduardo Luís Joao Eduardo Luis João Eduardo Luís João Eduardo Luís Joao Luis +João Eduardo Luís João Eduardo Luís João Eduardo Luís Joao Eduardo Luis João Eduardo Luís Joao Eduardo Luis Joe Buck +John Spray John Spray john John Spray -John Spray +Johnu George John Wilkins John Wilkins John Wilkins -John Wilkins -John Wilkins John Wilkins -Johnu George +John Wilkins +John Wilkins +Josh Durgin Josh During Josh Durgin Josh Durgin -Josh Durgin Josh During Kacper Kowalik Kacper Kowalik (Xarthisius) Kefu Chai Kiseleva Alyona Ved-vampir Laszlo Boszormenyi Laszlo Boszormenyi (GCS) Lluis Pamies-Juarez +Loic Dachary +Loic Dachary Loic Dachary Loic Dachary Loïc Dachary -Loic Dachary -Loic Dachary +Ma Jianpeng Jianpeng Ma Ma Jianpeng Ma Jianpeng Ma, Jianpeng -Ma Jianpeng Jianpeng Ma Marco Garcês Marco Garcês Mark Nelson Matthew Roy @@ -130,15 +130,15 @@ Noah Watkins Noah Watkins Pascal de Bruijn Pascal de Bruijn | Unilogic Networks B.V Patience Warnick -Patrick McGarry Patrick McGarry scuttlemonkey +Patrick McGarry Pavan Rallabhandi Pavan Rallabhandi -Robert Jansen +Riccardo Ferretti rferrett Roald J. van Loon +Robert Jansen Ron Allred rallred Ross Turk Ross Turk -Riccardo Ferretti rferrett Sage Weil Sage Weil Sage Weil @@ -153,23 +153,23 @@ Sage Weil Sage Weil Sage Weil Sahid Orentino Ferdjaoui Sam Lang -Samuel Just -Samuel Just Samuel Just +Samuel Just +Samuel Just Samuel Just Sam Just Samuel Just Samuel Just Samuel Just Samuel Just -Samuel Just -Scott A. Brandt sbrandt +Samuel Just Sandon Van Ness SandonV Sandon Van Ness +Scott A. Brandt sbrandt Sebastien Han Sebastien Ponce Sebastien Ponce Shanggao Qiu qiushanggao -Shu, Xinxin xinxinsh Shu, Xinxin xinxin shu +Shu, Xinxin xinxinsh Stephen F Taylor Sushma Gurram sushma Swami Reddy M Ranga Swami Reddy @@ -180,10 +180,10 @@ Tamil Muthamizhan tamil Tamil Muthamizhan Thomas Bechtold +Thomas Cantin ThomasCantin Tommi Virtanen Tommi Virtanen Tommi Virtanen -Thomas Cantin ThomasCantin Tyler Brekke Concubidated Volker Assmann Volker Assmann @@ -207,12 +207,12 @@ Yehuda Sadeh Yehuda Sadeh Yehuda Sadeh Yehuda Sadeh -Yehuda Sadeh Yehuda Sadeh +Yehuda Sadeh Yongyue Sun Abioy Yuan Zhou +Zhi (David) Zhang Zhiqiang Wang Signed-off-by: Zhiqiang Wang +Zhiqiang Wang Wang, Zhiqiang Zhiqiang Wang Zhiqiang Wang Zhiqiang Wang Zhiqiang Wang -Zhiqiang Wang Wang, Zhiqiang -Chendi Xue Chendi Xue diff --git a/.organizationmap b/.organizationmap index 25177ef1f6294..1ce0b7d7071ec 100644 --- a/.organizationmap +++ b/.organizationmap @@ -40,8 +40,8 @@ CERN Andreas Peters CERN Dan van der Ster CERN Sebastien Ponce Choopa, LLC Adam Twardowski -CISCO Kai Zhang CISCO Johnu George +CISCO Kai Zhang Cloudwatt Christophe Courtaut Cloudwatt Florent Flament Cloudwatt Loic Dachary @@ -88,8 +88,8 @@ GRNet Vangelis Koukis Hastexo Florian Haas HGST Kevin Dalley HGST Lluis Pamies-Juarez -HP Blaine Gardner Hostplex Hosting Andras Elso +HP Blaine Gardner iNic Bjørnar Ness Inktank Alexandre Marangone Inktank Alex Elder @@ -123,28 +123,28 @@ Inktank Tommi Virtanen Inktank Tyler Brekke Inktank Warren Usui Inktank Yehuda Sadeh +Intel Chendi Xue Intel Ma Jianpeng Intel Shu, Xinxin Intel Wang, Yaguang -Intel Yan, Zheng Intel Xiaoxi Chen -Intel Zhiqiang Wang +Intel Yan, Zheng Intel Yuan Zhou -Intel Chendi Xue +Intel Zhiqiang Wang Iron Systems Inc. Harpreet Dhillon IT Refined Ron Allred IWeb David Moreau Simard -Keeper Technology Wyllys Ingersoll Karlsruhe Institute of Technology Daniel J. Hofmann +Keeper Technology Wyllys Ingersoll Lebanon Evangelical School Jonathan Dieter Los Alamos National Laboratory Esteban Molina-Estolano +Mellanox Vu Pham Mirantis Andrew Woodward Mirantis Dmytro Iurchenko Mirantis Kiseleva Alyona Mirantis Mykola Golub Mirantis Radoslaw Zarzynski MIT Computer Science and Artificial Intelligence Laboratory Stephen Jahl -Mellanox Vu Pham Nebula Chris Holcombe Opower Derrick Schneider Pacific Northwest National Laboratory Brown, David M JR @@ -173,8 +173,8 @@ Red Hat Josh Durgin Red Hat JuanJose 'JJ' Galvez Red Hat Kefu Chai Red Hat Ken Dreyer -Red Hat Loic Dachary Red Hat Loic Dachary +Red Hat Loic Dachary Red Hat Luis Pabón Red Hat Mark Nelson Red Hat Neil Levine @@ -189,8 +189,8 @@ Red Hat Sam Lang Red Hat Samuel Just Red Hat Sandon Van Ness Red Hat Tamil Muthamizhan -Red Hat Travis Rhoden Red Hat Tom Callaway +Red Hat Travis Rhoden Red Hat Tyler Brekke Red Hat Venky Shankar Red Hat Warren Usui @@ -204,9 +204,9 @@ Sandia National Laboratories Jim Schutt Allen Samuels SanDisk Anand Bhat SanDisk Pavan Rallabhandi +SanDisk Shishir Gowda SanDisk Somnath Roy SanDisk Sushma Gurram -SanDisk Shishir Gowda Science & Technology Facilities Council George Ryall SendFaster Christopher O'Connell Spectra Logic Alan Somers @@ -219,35 +219,34 @@ SUSE Owen Synge SUSE Thorsten Behrens SWITCH Jens-Christian Fischer SWITCH Simon Leinen -Telecom Bretagne Ahoussi Armand -Telecom Bretagne Baptiste Veuillez -Telecom Bretagne Hazem Amara -Telecom Bretagne Thomas Cantin TCloud Computing CC Lien TCloud Computing Henry C Chang TCloud Computing Herb Shiu TCloud Computing Paul Chiang +Telecom Bretagne Ahoussi Armand +Telecom Bretagne Baptiste Veuillez +Telecom Bretagne Hazem Amara +Telecom Bretagne Thomas Cantin The Linux Box Adam C. Emerson The Linux Box Ali Maredia The Linux Box Casey Bodley The Linux Box Matt Benjamin The University of Arizona James Ryan Cresawn Ubuntu Kylin Li Wang -Ubuntu Kylin Yunchuan Wen Ubuntu Kylin Min Chen Ubuntu Kylin MingXin Liu -Unaffiliated Yongyue Sun -Unaffiliated Armando Segnini +Ubuntu Kylin Yunchuan Wen Unaffiliated Accela Zhao Unaffiliated Ailing Zhang -Unaffiliated Anis Ayari Unaffiliated Andy Allan +Unaffiliated Anis Ayari +Unaffiliated Armando Segnini Unaffiliated BJ Lougee Unaffiliated Cheng Cheng Unaffiliated Christos Stavrakakis -Unaffiliated Daniel Schepler Unaffiliated Colin Mattson Unaffiliated Dan Chai +Unaffiliated Daniel Schepler Unaffiliated David Anderson Unaffiliated Ding Dinghua Unaffiliated Dominik Hannen @@ -255,16 +254,15 @@ Unaffiliated Dongmao Zhang Unaffiliated Erik Logtenberg Unaffiliated Federico Gimenez Unaffiliated Feng He -Unaffiliated Florian Coste Unaffiliated Florent Bautista +Unaffiliated Florian Coste Unaffiliated François Lafont Unaffiliated Frank Yu Unaffiliated Huang Jun -Unaffiliated Jian Wen -Unaffiliated Jiang Heng Unaffiliated Janne Grunau -Unaffiliated Xie Rui <875016668@qq.com> +Unaffiliated Jiang Heng Unaffiliated Jiantao He +Unaffiliated Jian Wen Unaffiliated Karel Striegel Unaffiliated Kefu Chai Unaffiliated Kevin Cox @@ -273,9 +271,9 @@ Unaffiliated koleosfuscus Unaffiliated Laurent Guerby Unaffiliated Matt Richards Unaffiliated Mehdi Abaakouk -Unaffiliated Michal Jarzabek Unaffiliated Michael Nelson Unaffiliated Michael Riederer +Unaffiliated Michal Jarzabek Unaffiliated Ning Yao Unaffiliated (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9> Unaffiliated Roman Haritonov @@ -289,13 +287,15 @@ Unaffiliated Volker Voigt Unaffiliated VRan Liu Unaffiliated William A. Kennington III Unaffiliated xan +Unaffiliated Xie Rui <875016668@qq.com> Unaffiliated Xinze Chi Unaffiliated Yann Dupont +Unaffiliated Yongyue Sun Unilogic Networks B.V Pascal de Bruijn +UnitedStack Dong Yuan UnitedStack Guangliang Zhao UnitedStack Haomai Wang UnitedStack Kun Huang -UnitedStack Dong Yuan UnitedStack Rongze Zhu University of California, Santa Cruz Adam Crume University of California, Santa Cruz Andrew Leung @@ -316,13 +316,13 @@ Whatever Sylvain Munaut Wido den Hollander X-ION Mouad Benchchaoui X-ION Stephan Renatus -Yahoo! Zhi (David) Zhang Yahoo! Guang Yang Yahoo! Haifeng Liu Yahoo! Lei Dong Yahoo! Ray Lv Yahoo! Wei Luo Yahoo! Xihui He +Yahoo! Zhi (David) Zhang YouScribe Guilhem Lettron # # Local Variables: diff --git a/.peoplemap b/.peoplemap index e80af2ef9e578..9867dc35c9236 100644 --- a/.peoplemap +++ b/.peoplemap @@ -34,14 +34,11 @@ Noah Watkins Noah Watkins Patrick McGarry Patrick McGarry Ross Turk Ross Turk Sage Weil Sage Weil +Sahid Orentino Ferdjaoui Sahid Orentino Ferdjaoui Samuel Just Samuel Just Sandon Van Ness Sandon Van Ness Tamil Muthamizhan Tamil Muthamizhan Tyler Brekke Tyler Brekke Warren Usui Warren Usui -Yehuda Sadeh Yehuda Sadeh -John Wilkins John Wilkins Yan, Zheng Yan, Zheng -Sahid Orentino Ferdjaoui Sahid Orentino Ferdjaoui -João Eduardo Luís João Eduardo Luís -Ilya Dryomov Ilya Dryomov +Yehuda Sadeh Yehuda Sadeh -- 2.39.5