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.

Sign up for GitHub

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

Jump to bottom

mailmap: V12.0.1 credits #14479

Merged
24 commits merged into from Apr 24, 2017
Merged

mailmap: V12.0.1 credits #14479

24 commits merged into from Apr 24, 2017

Conversation

swamireddy
Copy link
Contributor

DNM: V12.0.1 credits - updated the .orgnizationmap and .mailmap files

@swamireddy
mailmap: Lihongjie affiliation
db91601 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Chu Hua-Rong affiliation
3e19caf 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Shasha Lu affiliation
732bc05 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Edwin F Boza affiliation
b144e9b 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
Copy link
Contributor Author

@dachary - Can you please review the above pull request?

ghost
ghost suggested changes Apr 20, 2017
View reviewed changes
.organizationmap Outdated
Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>
UMCloud <contact@umcloud.com> Jiaying Ren <mikulely@gmail.com>
UMCloud <contact@umcloud.com> Rongze Zhu <zrzhit@gmail.com>
UMCloud <contact@umcloud.com> ZVampirEM77 <enming.zhang@umcloud.com>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enming Zhang ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update. Thanks

.organizationmap Outdated
@@ -736,6 +756,7 @@ ZTE <contact@zte.com.cn> Luo Runbing <runsisi@zte.com.cn>
ZTE <contact@zte.com.cn> Xie Xingguo <xie.xingguo@zte.com.cn>
ZTE <contact@zte.com.cn> Shun Song <song.shun3@zte.com.cn>
ZTE <contact@zte.com.cn> Song Baisen <song.baisen@zte.com.cn>
ZTE <contact@zte.com.cn> tangwenjun3 <tang.wenjun3@zte.com.cn>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tang Wenjun ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update. Thanks

@swamireddy swamireddy force-pushed the v12.0.1_credits branch 2 times, most recently from 394f8bd to 8bbfc7f Compare April 20, 2017 12:04
@swamireddy
Copy link
Contributor Author

@dachary - Updated as suggested. Thanks Swami

@ghost
Copy link

ghost commented Apr 20, 2017

When I run the script on your branch here is what I get:

Number of lines added and removed, by authors
     1	 18275 Sage Weil 
     2	 15281 Jason Dillaman 
     3	 10016 Chang Liu 
     4	  9043 Yehuda Sadeh 
     5	  8715 Abhishek Lekshmanan 
     6	  5488 Dongsheng Yang 
     7	  5350 John Spray 
     8	  2568 Mykola Golub 
     9	  2278 Kefu Chai 
    10	  2017 Venky Shankar 
    11	  1823 Loic Dachary 
    12	  1685 Victor Denisov 
    13	  1628 Nathan Cutler 
    14	  1468 Gui Hecheng 
    15	  1401 Igor Fedotov 
    16	  1213 Haomai Wang 
    17	   875 Bartłomiej Święcki 
    18	   680 Yan, Zheng 
    19	   665 Patrick Donnelly 
    20	   582 Yuri Weinstein 
    21	   501 Amir Vadai 
    22	   462 Samuel Just 
    23	   461 João Eduardo Luís 
    24	   445 Radoslaw Zarzynski 
    25	   417 Zhang Shaowen 
    26	   374 Matt Benjamin 
    27	   356 Luo Runbing 
    28	   272 Willem Jan Withagen 
    29	   267 wei xiao 
    30	   264 Ilya Dryomov 
    31	   261 Casey Bodley 
    32	   225 Xie Xingguo 
    33	   210 Pan Liu 
    34	   200 Yunchuan Wen 
    35	   162 Adam Kupczyk 
    36	   130 Song Baisen 
    37	   130 Barbora Ančincová 
    38	   123 David Disseldorp 
    39	   123 Chuanhong Wang 
    40	    98 Zack Cerza 
    41	    97 Danny Al-Gaaf 
    42	    92 Jan Fajerski 
    43	    90 Adam C. Emerson 
    44	    82 Bassam Tabbara 
    45	    73 wangzhengyong 
    46	    68 Ziye Yang 
    47	    68 David Zafman 
    48	    66 Xiaoxi Chen 
    49	    65 Orit Wasserman 
    50	    61 Vikhyat Umrao 
    51	    57 Guillaume Abrioux 
    52	    56 Sarit Zubakov 
    53	    54 Adir Lev 
    54	    51 optimistyzy 
    55	    49 Robin H. Johnson 
    56	    49 Nikita Gerasimov 
    57	    48 Erwan Velu 
    58	    47 Wido den Hollander 
    59	    44 Ma Jianpeng 
    60	    36 Saumay Agrawal 
    61	    32 Ken Dreyer 
    62	    30 Mingxin Liu 
    63	    26 lu.shasha 
    64	    25 Zhiqiang Wang 
    65	    23 Dan Mick 
    66	    23 Brad Hubbard 
    67	    21 Jiaying Ren 
    68	    20 lvshuhua 
    69	    19 Drunkard Zhang 
    70	    18 Greg Farnum 
    71	    15 Ali Maredia 
    72	    12 Jing Wenjun 
    73	    11 Zhang Zezhu 
    74	    11 Dave Chen 
    75	    11 Dan van der Ster 
    76	    10 Zhi Zhang 
    77	    10 Ren Huanwen 
    78	    10 lihongjie 
    79	     9 tangwenjun 
    80	     9 Pavan Rallabhandi 
    81	     9 hrchu 
    82	     8 Jenkins 
    83	     7 Tamil Muthamizhan 
    84	     7 Michal Jarzabek 
    85	     6 Tang Jin 
    86	     6 Tahia Khan 
    87	     6 Sébastien Han 
    88	     6 DanielBar-On 
    89	     6 Alexey Sheplyakov 
    90	     5 Ning Yao 
    91	     5 Boris Ranto 
    92	     4 Kyr Shatskyy 
    93	     4 Jie Wang 
    94	     4 haodong.tang 
    95	     4 Gu Zhongyan 
    96	     4 Ganesh Mahalingam 
    97	     4 Edwin F. Boza 
    98	     3 Zhao Chao 
    99	     3 shiqi <1454927420@qq.com>
   100	     3 Li Wang 
   101	     3 Josh Durgin 
   102	     2 ZVampirEM77 
   103	     2 Yankun Li 
   104	     2 Wei Jin 
   105	     2 Taeksang Kim 
   106	     2 Ruben Kerkhof 
   107	     2 Ronak Jain 
   108	     2 Owen Synge 
   109	     2 Michael Eischer 
   110	     2 Liu Yang 
   111	     2 hechuang 
   112	     2 Gaurav Kumar Garg 
   113	     2 craigchi 
   114	     1 Shinobu Kinjo 
   115	     1 Jos Collin 
   116	     1 Henrik Korkuc 

Number of lines added and removed, by organization
     1	 58112 Red Hat 
     2	 11021 SUSE 
     3	 10026 Tencent 
     4	  6267 Mirantis 
     5	  5488 Easystack 
     6	  2000 China Mobile 
     7	  1270 XSky 
     8	   875 OVH 
     9	   855 ZTE 
    10	   663 Unaffiliated 
    11	   272 Digiware 
    12	   267 Linaro 
    13	   216 Istuary Innovation Group 
    14	   207 Kylin Cloud 
    15	   127 Intel 
    16	   116 Mellanox 
    17	    97 Deutsche Telekom 
    18	    82 Quantum Corporation 
    19	    66 Ebay 
    20	    49 Oracle 
    21	    49 DreamHost 
    22	    47 Wido 42on 
    23	    26 EISOO 
    24	    11 CERN 
    25	     9 Walmart Labs 
    26	     9 tangwenjun 
    27	     9 Chunghwa Telecom 
    28	     7 UnitedStack 
    29	     5 Eayun 
    30	     4 ESPOL 
    31	     3 shiqi <1454927420@qq.com>
    32	     2 ZVampirEM77 
    33	     2 Wanda ffan 
    34	     2 Inktank 
    35	     2 FAU 
    36	     1 Uber 

Commits, by authors
     1	    309 Sage Weil 
     2	     74 Kefu Chai 
     3	     66 John Spray 
     4	     59 Loic Dachary 
     5	     44 Yehuda Sadeh 
     6	     44 Jason Dillaman 
     7	     44 Dongsheng Yang 
     8	     31 Chang Liu 
     9	     26 Yan, Zheng 
    10	     25 Patrick Donnelly 
    11	     24 Haomai Wang 
    12	     19 Gui Hecheng 
    13	     18 Matt Benjamin 
    14	     17 Willem Jan Withagen 
    15	     16 Nathan Cutler 
    16	     16 Danny Al-Gaaf 
    17	     14 Pan Liu 
    18	     14 Igor Fedotov 
    19	     14 Casey Bodley 
    20	     13 Xie Xingguo 
    21	     13 Mykola Golub 
    22	     11 Venky Shankar 
    23	     10 Zack Cerza 
    24	     10 Song Baisen 
    25	     10 Radoslaw Zarzynski 
    26	      9 Drunkard Zhang 
    27	      9 Adam C. Emerson 
    28	      9 Abhishek Lekshmanan 
    29	      8 Zhang Shaowen 
    30	      8 wangzhengyong 
    31	      8 Samuel Just 
    32	      8 Ma Jianpeng 
    33	      8 Jiaying Ren 
    34	      6 David Zafman 
    35	      5 Sarit Zubakov 
    36	      5 Mingxin Liu 
    37	      5 João Eduardo Luís 
    38	      5 Dan Mick 
    39	      4 Yunchuan Wen 
    40	      4 Xiaoxi Chen 
    41	      4 Vikhyat Umrao 
    42	      4 Ilya Dryomov 
    43	      4 Barbora Ančincová 
    44	      4 Adam Kupczyk 
    45	      3 Zhang Zezhu 
    46	      3 Orit Wasserman 
    47	      3 optimistyzy 
    48	      3 Ken Dreyer 
    49	      3 Jing Wenjun 
    50	      3 Greg Farnum 
    51	      3 David Disseldorp 
    52	      3 Brad Hubbard 
    53	      3 Boris Ranto 
    54	      3 Adir Lev 
    55	      2 Ziye Yang 
    56	      2 Zhiqiang Wang 
    57	      2 Wido den Hollander 
    58	      2 tangwenjun 
    59	      2 Tahia Khan 
    60	      2 Saumay Agrawal 
    61	      2 Robin H. Johnson 
    62	      2 Pavan Rallabhandi 
    63	      2 lvshuhua 
    64	      2 lu.shasha 
    65	      2 Luo Runbing 
    66	      2 Jie Wang 
    67	      2 Erwan Velu 
    68	      2 Edwin F. Boza 
    69	      2 DanielBar-On 
    70	      2 Chuanhong Wang 
    71	      2 Bartłomiej Święcki 
    72	      2 Amir Vadai 
    73	      1 ZVampirEM77 
    74	      1 Zhi Zhang 
    75	      1 Zhao Chao 
    76	      1 Yuri Weinstein 
    77	      1 Yankun Li 
    78	      1 wei xiao 
    79	      1 Wei Jin 
    80	      1 Victor Denisov 
    81	      1 tangwenjun3 
    82	      1 Tang Jin 
    83	      1 Tamil Muthamizhan 
    84	      1 Taeksang Kim 
    85	      1 shiqi <1454927420@qq.com>
    86	      1 Shinobu Kinjo 
    87	      1 Sébastien Han 
    88	      1 Ruben Kerkhof 
    89	      1 Ronak Jain 
    90	      1 Ren Huanwen 
    91	      1 Owen Synge 
    92	      1 Ning Yao 
    93	      1 Nikita Gerasimov 
    94	      1 Michal Jarzabek 
    95	      1 Michael Eischer 
    96	      1 Li Wang 
    97	      1 Liu Yang 
    98	      1 lihongjie 
    99	      1 Kyr Shatskyy 
   100	      1 Josh Durgin 
   101	      1 Jos Collin 
   102	      1 Jenkins 
   103	      1 Jan Fajerski 
   104	      1 hrchu 
   105	      1 Henrik Korkuc 
   106	      1 hechuang

@swamireddy
Copy link
Contributor Author

swamireddy commented Apr 20, 2017 via email

@swamireddy
Copy link
Contributor Author

swamireddy commented Apr 20, 2017 via email

@swamireddy swamireddy force-pushed the v12.0.1_credits branch 2 times, most recently from ee62181 to 9dedca8 Compare April 21, 2017 13:29
@swamireddy
Copy link
Contributor Author

@dachary - Can you please check now? (expect "shiqi 1454927420@qq.com" rest all fixed)

..
Commits by organizations
1 765 Red Hat contact@redhat.com
2 44 Easystack contact@easystack.cn
3 43 Mirantis contact@mirantis.com
4 41 China Mobile contact@chinamobile.com
5 35 Unaffiliated no@organization.net
6 35 SUSE contact@suse.com
7 32 XSky contact@xsky.com
8 32 Tencent contact@tencent.com
9 31 ZTE contact@zte.com.cn
10 17 Digiware contact@digiware.nl
11 16 Deutsche Telekom contact@telekom.de
12 15 Istuary Innovation Group contact@istuary.com
13 12 Intel contact@intel.com
14 10 Mellanox contact@mellanox.com
15 7 Kylin Cloud contact@kylin-cloud.com
16 4 Ebay contact@ebay.com
17 3 Tang Wenjun tang.wenjun3@zte.com.cn
18 2 Wido 42on contact@42on.com
19 2 Walmart Labs contact@walmartlabs.com
20 2 UnitedStack contact@unitedstack.com
21 2 OVH ceph@ovh.net
22 2 ESPOL contact@espol.edu.ec
23 2 EISOO contact@eisoo.com
24 2 Eayun contact@eayun.com
25 2 DreamHost contact@dreamhost.com
26 1 Wanda ffan contact@wanda.cn
27 1 UMCloud contact@umcloud.com
28 1 Uber contact@uber.com
29 1 shiqi 1454927420@qq.com
30 1 Quantum Corporation info@quantum.com
31 1 Oracle contact@oracle.com
32 1 Linaro contact@linaro.org
33 1 Inktank contact@inktank.com
34 1 FAU contact@fau.de
35 1 Chunghwa Telecom contact@cht.com.tw
36 1 CERN contact@cern.ch

@ghost
Copy link

ghost commented Apr 21, 2017

These still need fixing:

Number of lines added and removed, by organization
...
    26	     9 Tang Wenjun 
    31	     3 shiqi <1454927420@qq.com>
Reviews, by organizations (one review spans multiple commits)
...
     7	      2 Yuri Weinstein 
    15	      1 Nathan Cutler 
    16	      1 Ian Colle

You need to resolve the conflict before this is merged.

@swamireddy
Copy link
Contributor Author

@dachary - now looks clean.

ghost
ghost suggested changes Apr 21, 2017
View reviewed changes
.mailmap
@@ -258,7 +259,7 @@ Min Chen <minchen@ubuntukylin.com>
MingXin Liu <mingxin.liu@kylin-cloud.com> <mingxinliu@ubuntukylin.com>
Mingyue Zhao <zhao.mingyue@h3c.com>
Mykola Golub <mgolub@mirantis.com> <mgolub@zhuzha.mirantis.lviv.net>
Nathan Cutler <ncutler@suse.com>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to keep

Nathan Cutler <ncutler@suse.com>

and add

Nathan Cutler <ncutler@suse.com> <nculter@suse.com>

after it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated as above.

.mailmap Outdated
@@ -364,6 +365,7 @@ Sushma Gurram <sushma.gurram@sandisk.com>
Swami Reddy <swami.reddy@ril.com> <swamireddy@gmail.com>
Sylvain Munaut <s.munaut@whatever-company.com> <tnt@246tNt.com>
Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
Tang Wenjun <tang.wenjun3@zte.com.cn>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate Tang Wenjun

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the duplicated one.

.mailmap
@@ -372,6 +374,7 @@ Tamil Muthamizhan <tmuthami@redhat.com>
Tamil Muthamizhan <tmuthami@redhat.com> <tmuthamizhan@MacBook-Air.local>
Tamil Muthamizhan <tmuthami@redhat.com> <tamil@magna002.ceph.redhat.com>
Tang Jin <tang.jin@istuary.com>
Tang Wenjun <tang.wenjun3@zte.com.cn>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate Tang Wenjun

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dachary - Hope, all fixed, can you please check?

@swamireddy
mailmap: Michael Eischer affiliation
a2c6949 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Ziye Yang affiliation
0a67059 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: wei xiao affiliation
0d8bd7a 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: DanielBar-On affiliation
b9252af 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Nikita Gerasimov affiliation
72b1877 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Guillaume Abrioux affiliation
44a5751 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Jos Collin affiliation
67eaf17 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Tang Wenjun affiliation
86af17b 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: hechuang affiliation
fafd03f 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Taeksang Kim affiliation
6bd6ab6 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Tahia Khan affiliation
8e7c89b 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Saumay Agrawal affiliation
5142f0d 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Enming Zhang affiliation
063d9ea 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: craigchi affiliation
4a40de1 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: haodong tang affiliation
d6b95d3 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Kyr Shatskyy affiliation
cf7cf28 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Ian Colle affiliation
81c65be 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Nathan Cutler name normalization
3d7648e 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
mailmap: Yuri Weinstein name normalization
ce382b9 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@ghost
Copy link

ghost commented Apr 21, 2017

It looks good. Now please resolve the conflict.

@swamireddy swamireddy force-pushed the v12.0.1_credits branch 2 times, most recently from c7d2543 to 9fa0c23 Compare April 23, 2017 06:03
@swamireddy
Copy link
Contributor Author

swamireddy commented Apr 24, 2017 via email

@ghost
Copy link

ghost commented Apr 24, 2017

The .organizationmap conflict is still here

@swamireddy
mailmap: shiqi name normalization
19b9ecc 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
@swamireddy
Copy link
Contributor Author

swamireddy commented Apr 24, 2017 via email

@ghost ghost changed the title DNM: V12.0.1 credits mailmap: V12.0.1 credits Apr 24, 2017
@ghost ghost added the documentation label Apr 24, 2017
@swamireddy
Copy link
Contributor Author

check

@ghost
Copy link

ghost commented Apr 24, 2017

jenkins test this please

@ghost ghost merged commit 27445ce into ceph:master Apr 24, 2017
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
Assignees
No one assigned
Labels
documentation
Projects
None yet
Milestone
No milestone
1 participant
@swamireddy