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: Update OVH contributors #13063

Merged
1 commit merged into from Feb 3, 2017
Merged

Conversation

byo
Copy link

@byo byo commented Jan 23, 2017

Signed-off-by: Bartłomiej Święcki bartlomiej.swiecki@corp.ovh.com

.organizationmap Outdated
@@ -272,7 +272,10 @@ Nebula <info@nebula.com> Chris Holcombe <chris.holcombe@nebula.com>
Ocado <contact@ocado.com> Luis Periquito <luis.periquito@ocado.com>
Odiso <contact@odiso.com> Alexandre Derumier <aderumier@odiso.com>
Opower <contact@opower.com> Derrick Schneider <derrick.schneider@opower.com>
OVH <contact@corp.ovh.com> Etienne Menguy <etienne.menguy@corp.ovh.com>
OVH <ceph@ovh.net> Etienne Menguy <etienne.menguy@corp.ovh.com>
OVH <ceph@ovh.net> Piotr Dałek <piotr.dalek@corp.ovh.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 make an entry for Piotr in .peoplemap as well, this captures the change in affiliation when we generate credits so that older credits affiliate correctly as well

Copy link
Author

Choose a reason for hiding this comment

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

@theanalyst: Updated .peoplemap file

@byo byo force-pushed the wip-mailmap-ovh-contributors branch from cb6677a to 804245e Compare January 23, 2017 12:24
@theanalyst
Copy link
Member

Thanks for the update, we might wait a couple of days and merge it as soon as #12335 is also in (so as to avoid large rebases :))

@byo
Copy link
Author

byo commented Jan 23, 2017

Sure, no problem for me

@byo
Copy link
Author

byo commented Feb 2, 2017

@theanalyst Anything I could do to help further rebasing? I could merge theanalyst:mailmap/v11.1.0 to this PR, or maybe it would be better to submit this PR onto your branch?

@theanalyst
Copy link
Member

@byo could you just rebase atop of my branch ie #12335, I'll either merge that in, or take this pr as it is then. thanks!

@theanalyst theanalyst requested a review from a user February 2, 2017 15:44
@theanalyst
Copy link
Member

@byo now merged, so you can rebase atop current master and we should be fine

@ghost
Copy link

ghost commented Feb 2, 2017

needs rebase

Signed-off-by: Bartłomiej Święcki <bartlomiej.swiecki@corp.ovh.com>
@byo byo force-pushed the wip-mailmap-ovh-contributors branch from 804245e to f74d7f3 Compare February 2, 2017 15:56
@byo
Copy link
Author

byo commented Feb 2, 2017

@theanalyst, @dachary : rebased on top of current master

@byo
Copy link
Author

byo commented Feb 3, 2017

@dachary I guess this is ready now :)

@ghost ghost merged commit dd859f4 into ceph:master Feb 3, 2017
@byo byo deleted the wip-mailmap-ovh-contributors branch February 6, 2017 09:27
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
3 participants