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

Conversation

Projects
None yet
3 participants
@byo
Contributor

byo commented Jan 23, 2017

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

@@ -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>

This comment has been minimized.

@theanalyst

theanalyst Jan 23, 2017

Member

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

This comment has been minimized.

@byo

byo Jan 23, 2017

Contributor

@theanalyst: Updated .peoplemap file

@theanalyst

This comment has been minimized.

Member

theanalyst commented Jan 23, 2017

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

This comment has been minimized.

Contributor

byo commented Jan 23, 2017

Sure, no problem for me

@liewegas liewegas added the build/ops label Jan 23, 2017

@byo

This comment has been minimized.

Contributor

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

This comment has been minimized.

Member

theanalyst commented Feb 2, 2017

@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 Feb 2, 2017

@theanalyst

This comment has been minimized.

Member

theanalyst commented Feb 2, 2017

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

@ghost

ghost approved these changes Feb 2, 2017

@ghost

This comment has been minimized.

ghost commented Feb 2, 2017

needs rebase

Bartłomiej Święcki
mailmap: Update OVH contributors
Signed-off-by: Bartłomiej Święcki <bartlomiej.swiecki@corp.ovh.com>
@byo

This comment has been minimized.

Contributor

byo commented Feb 2, 2017

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

@byo

This comment has been minimized.

Contributor

byo commented Feb 3, 2017

@dachary I guess this is ready now :)

@ghost ghost merged commit dd859f4 into ceph:master Feb 3, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@byo byo deleted the ovh:wip-mailmap-ovh-contributors branch Feb 6, 2017

This issue was closed.

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