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: Update ztczll affiliation #16038

Merged
merged 1 commit into from Jul 25, 2017

Conversation

Projects
None yet
6 participants
@ztczll
Contributor

ztczll commented Jun 30, 2017

Signed-off-by: zhanglei 243290414@qq.com

@joscollin

Please squash the commits into one.

.mailmap Outdated
@@ -482,6 +482,7 @@ Zengran Zhang <zhangzengran@h3c.com>
Zeqiang Zhuang <zhuang.zeqiang@h3c.com>
Zhang Shaowen <zhang_shaowen@139.com>
Zhang Zezhu <zhang.zezhu@zte.com.cn>
Zhang Lei <ztczll243290414@gmail.com> <243290414@qq.com>

This comment has been minimized.

@joscollin

joscollin Jun 30, 2017

Member

This is not added in the alphabetical order.

.mailmap Outdated
@@ -498,3 +498,4 @@ Zhi Zhang <willzzhang@tencent.com>
Zhi Zhang <willzzhang@tencent.com> <zhangz.david@outlook.com>
Zhi Zhang <willzzhang@tencent.com> <zhangzhi@localhost.localdomain>
Zhuang Xiaochun <zhuangxc89@163.com>
Zhang Lei <zhanglei@trendytech.com.cn> <243290414@qq.com>

This comment has been minimized.

@joscollin

joscollin Jul 3, 2017

Member

I think you should swap this to make it similar to the entries made by other people.
Zhang Lei <243290414@qq.com> <zhanglei@trendytech.com.cn>

Also insert your line in the alphabetical order.

This comment has been minimized.

@ztczll

ztczll Jul 14, 2017

Contributor

How can I know the rules of insert alphabetical order?

This comment has been minimized.

@joscollin

joscollin Jul 14, 2017

Member

@ztczll Check if your name is in the alphabetical order.

This comment has been minimized.

@joscollin

joscollin Jul 20, 2017

Member

@ztczll See: Your entry should be the first of all Zhang's. At Line 483.

The bad thing happened was: someone else inserted his entries starting with Guo in between Z*. But that can be fixed later.

This comment has been minimized.

@ztczll

ztczll Jul 25, 2017

Contributor

thanks for reminding. That guy has been confused with me.

@joscollin joscollin changed the title from ztczll affiliation to .mailmap, .organizationmap: Update ztczll affiliation Jul 3, 2017

@tchaikov tchaikov requested a review from Abhishekvrshny Jul 20, 2017

@tchaikov tchaikov self-assigned this Jul 20, 2017

@Abhishekvrshny

This comment has been minimized.

Contributor

Abhishekvrshny commented Jul 20, 2017

@tchaikov I guess you meant to refer @theanalyst here for the review :)

.mailmap Outdated
@@ -498,3 +498,4 @@ Zhi Zhang <willzzhang@tencent.com>
Zhi Zhang <willzzhang@tencent.com> <zhangz.david@outlook.com>
Zhi Zhang <willzzhang@tencent.com> <zhangzhi@localhost.localdomain>
Zhuang Xiaochun <zhuangxc89@163.com>
Zhang Lei <243290414@qq.com> <zhanglei@trendytech.com.cn>

This comment has been minimized.

@theanalyst

theanalyst Jul 20, 2017

Member

reverse the order of emails, the mailmap should follow the preferred corrected syntax

This comment has been minimized.

@joscollin

joscollin Jul 20, 2017

Member

@theanalyst Then .organizationmap should be updated too, as per the new change. Please compare the other entries (or your own entry) between .mailmap and .organizationmap.

This comment has been minimized.

@theanalyst

theanalyst Jul 20, 2017

Member

yes, I left a comment in organizationmap as well, is that what you meant?

This comment has been minimized.

@joscollin

joscollin Jul 20, 2017

Member

@theanalyst
No. You asked to reverse the order of emails in the above comment. But conventionally, the first email ID added in .mailmap is included in the .organizationmap. It is followed in other people's entry as well. I'm not sure if this makes any technical issues though. But that is what being followed. Please check by yourself.

@@ -519,7 +519,7 @@ The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com>
Time Warner Cable Inc. <contact@twcable.com> Bryan Stillwell <bryan.stillwell@twcable.com>
Trendy Tech <contact@trendytech.com.cn> shiqi <m13913886148@gmail.com>
Trendy Tech <contact@trendytech.com.cn> Lei Zhang <243290414@qq.com>
Trendy Tech <contact@trendytech.com.cn> Zhang Lei <243290414@qq.com>

This comment has been minimized.

@theanalyst

theanalyst Jul 20, 2017

Member

This should ideally be the @trendytech.com email

.mailmap Outdated
@@ -498,3 +498,4 @@ Zhi Zhang <willzzhang@tencent.com>
Zhi Zhang <willzzhang@tencent.com> <zhangz.david@outlook.com>
Zhi Zhang <willzzhang@tencent.com> <zhangzhi@localhost.localdomain>
Zhuang Xiaochun <zhuangxc89@163.com>
Zhang Lei <243290414@qq.com> <zhanglei@trendytech.com.cn>

This comment has been minimized.

@joscollin

joscollin Jul 20, 2017

Member

@theanalyst Then .organizationmap should be updated too, as per the new change. Please compare the other entries (or your own entry) between .mailmap and .organizationmap.

@Abhishekvrshny Abhishekvrshny removed their request for review Jul 20, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jul 20, 2017

@Abhishekvrshny ahh, right! sorry and thanks!

.mailmap Outdated
@@ -485,6 +485,8 @@ Zengran Zhang <zhangzengran@h3c.com>
Zeqiang Zhuang <zhuang.zeqiang@h3c.com>
Zhang Shaowen <zhang_shaowen@139.com>
Zhang Zezhu <zhang.zezhu@zte.com.cn>
Zhang Lei <zhanglei@trendytech.com.cn>
Zhang Lei <zhanglei@trendytech.com.cn> <243290414@qq.com>
Guo Zhandong <guozhandong@cmss.chinamobile.com>

This comment has been minimized.

@joscollin

joscollin Jul 25, 2017

Member

@ztczll
It should be at L486, above all Zhangs.

This comment has been minimized.

@ztczll

ztczll Jul 25, 2017

Contributor

Okay, I've fixed it.

.mailmap, .organizationmap: Update ztczll affiliation
Signed-off-by: zhanglei <243290414@qq.com>
@joscollin

LGTM

I have verified that the review comments of theanalyst are already addressed. So I'm merging this. Thank you.

@joscollin joscollin merged commit 77ecc5c into ceph:master Jul 25, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

@ztczll ztczll deleted the ztczll:ztczll branch Jul 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment