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.

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

.mailmap, .organizationmap: add Fufei, Mingqiao and Ying Affiliation #17540

Merged
merged 1 commit into from Sep 7, 2017

Conversation

heyingstar
Copy link
Contributor

Ying He's PR #16836
wumingqiao's PR #16553
shangfufei's PR #16006

Signed-off-by: Ying He heyingbj@inspur.com

@heyingstar
Copy link
Contributor Author

@joscollin Please help me review this. Thank you.

@joscollin joscollin self-requested a review September 7, 2017 12:18
@joscollin joscollin changed the title .mailmap, .organizationmap: add Ying He,wumingqiao,shangfufei to mailmap and affiliation .mailmap, .organizationmap: add Ying He,wumingqiao,shangfufei Sep 7, 2017
.mailmap Outdated
@@ -360,6 +360,7 @@ Sébastien Han <shan@redhat.com> <seb@redhat.com>
Sebastien Ponce <sebastien.ponce@cern.ch> <Sebastien.Ponce@cern.ch>
Sebastien Ponce <sebastien.ponce@cern.ch> root <root@lxbre43a05.cern.ch>
Sergey Arkhipov <nineseconds@yandex.ru>
shangfufei <shangfufei@inspur.com>
Copy link
Member

Choose a reason for hiding this comment

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

can you use the real name here (I belive Shang Fu Fei ?)

.mailmap Outdated
@@ -432,6 +433,7 @@ Wenjun Huang <wenjunhuang@tencent.com>
Wido den Hollander <wido@42on.com> <wido@widodh.nl>
Wu Xingyi <wuxingyi@letv.com>
Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
wumingqiao <wumingqiao@inspur.com>
Copy link
Member

Choose a reason for hiding this comment

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

here too

.mailmap Outdated
@@ -360,6 +360,7 @@ Sébastien Han <shan@redhat.com> <seb@redhat.com>
Sebastien Ponce <sebastien.ponce@cern.ch> <Sebastien.Ponce@cern.ch>
Sebastien Ponce <sebastien.ponce@cern.ch> root <root@lxbre43a05.cern.ch>
Sergey Arkhipov <nineseconds@yandex.ru>
shangfufei <shangfufei@inspur.com>
Copy link
Member

Choose a reason for hiding this comment

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

Is this a github username shangfufei? If so, please update your actual name, which is usually the Display Name in your email.

.mailmap Outdated
@@ -432,6 +433,7 @@ Wenjun Huang <wenjunhuang@tencent.com>
Wido den Hollander <wido@42on.com> <wido@widodh.nl>
Wu Xingyi <wuxingyi@letv.com>
Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
wumingqiao <wumingqiao@inspur.com>
Copy link
Member

Choose a reason for hiding this comment

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

ditto

.organizationmap Outdated
@@ -257,6 +257,9 @@ Inktank <contact@inktank.com> Tyler Brekke <tyler.brekke@inktank.com>
Inktank <contact@inktank.com> Warren Usui <warren.usui@inktank.com>
Inktank <contact@inktank.com> Yehuda Sadeh <yehuda@inktank.com>
Inktank <contact@inktank.com> Yuri Weinstein <yuri.weinstein@inktank.com>
Inspur <contact@inspur.com> shangfufei <shangfufei@inspur.com>
Inspur <contact@inspur.com> wumingqiao <wumingqiao@inspur.com>
Copy link
Member

@joscollin joscollin Sep 7, 2017

Choose a reason for hiding this comment

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

ditto.

Also it should be in the alphabetical order within the Inspur group of lines.

@heyingstar
Copy link
Contributor Author

@joscollin done! Thanks.

.mailmap Outdated
@@ -269,6 +270,7 @@ Michael Rodriguez <michael@newdream.net>
Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
Michal Koutný <mkoutny@suse.com>
Min Chen <minchen@ubuntukylin.com>
Mingqiao Wu <wumingqiao@inspur.com>
Copy link
Member

Choose a reason for hiding this comment

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

As per the current version of .mailmap, this is in the incorrect alphabetical order.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@joscollin Why? Can you help me change this.Thank you.
First name is 'Mingqiao'.
Last name is 'Wu'.
Thank you very much.

Copy link
Member

Choose a reason for hiding this comment

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

I meant, This is the correct order:

Min Chen
MingXin Liu
Mingqiao Wu
Mingyue Zhao 

I don't know how a capital letter came in between for MingXin. But that entry was already existing anyway.

@heyingstar heyingstar changed the title .mailmap, .organizationmap: add Ying He,wumingqiao,shangfufei .mailmap, .organizationmap: add Ying He,Mingqiao Wu,Fufei Shang Sep 7, 2017
.mailmap Outdated
@@ -269,6 +270,7 @@ Michael Rodriguez <michael@newdream.net>
Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
Michal Koutný <mkoutny@suse.com>
Min Chen <minchen@ubuntukylin.com>
Mingqiao Wu <wumingqiao@inspur.com>
Copy link
Member

Choose a reason for hiding this comment

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

I meant, This is the correct order:

Min Chen
MingXin Liu
Mingqiao Wu
Mingyue Zhao 

I don't know how a capital letter came in between for MingXin. But that entry was already existing anyway.

Signed-off-by: Ying He <heyingbj@inspur.com>
@heyingstar
Copy link
Contributor Author

@joscollin I see. Thank you.I changed it right now.
Thank you.

@joscollin joscollin changed the title .mailmap, .organizationmap: add Ying He,Mingqiao Wu,Fufei Shang .mailmap, .organizationmap: add Fufei, Mingqiao and Ying Affiliation Sep 7, 2017
@joscollin joscollin merged commit 1cb1e57 into ceph:master Sep 7, 2017
@heyingstar heyingstar deleted the wip-update-organization branch September 8, 2017 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants