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 and .orgmap: organization affiliation #8767

Merged
1 commit merged into from
May 14, 2016
Merged

Conversation

jjhuo
Copy link
Contributor

@jjhuo jjhuo commented Apr 26, 2016

Signed-off-by: Jianjian Huo jianjian.huo@ssi.samsung.com

@theanalyst
Copy link
Member

theanalyst commented Apr 26, 2016

LGTM, after the comment is addressed

@@ -339,6 +339,7 @@ Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roal
Ruijie Networks <contact@ruijie.com.cn> Ning Yao <yaoning@ruijie.com.cn>
Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
Samsung <contact@samsung.com> James Liu <james.liu@ssi.samsung.com>
Samsung <contact@samsung.com> Jianjian Huo <samuel.huo@gmail.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 it should be Samsung <contact@samsung.com> <jianjian.huo@ssi.samsung.com>, the mailmap will automatically associate your work email as primary

@jjhuo
Copy link
Contributor Author

jjhuo commented Apr 26, 2016

Done, thanks!

@@ -339,6 +339,7 @@ Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roal
Ruijie Networks <contact@ruijie.com.cn> Ning Yao <yaoning@ruijie.com.cn>
Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
Samsung <contact@samsung.com> James Liu <james.liu@ssi.samsung.com>
Samsung <contact@samsung.com> <jianjian.huo@ssi.samsung.com> Jianjian Huo <samuel.huo@gmail.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'm sorry I wasn't very clear last time, basically this line only needs the preferred (ie work) email.. so
Samsung <contact@samsung.com> Jianjian Huo <jianjian.huo@ssi.samsung.com>
would be the right entry.. as seen for other entries etc.

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
@jjhuo
Copy link
Contributor Author

jjhuo commented Apr 27, 2016

I see. had that fixed, thanks again!

@theanalyst
Copy link
Member

LGTM

@jjhuo
Copy link
Contributor Author

jjhuo commented May 13, 2016

@theanalyst could you please merge it? thanks!

@theanalyst theanalyst assigned ghost May 14, 2016
@ghost ghost merged commit 62bd3fa into ceph:master May 14, 2016
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants