mailmap updates for upcoming 11.0.0

[dupont-y]

Please disregard previous one (#9208), and use this one instead.
#9208 will be deleted. I wrongly merged mainstream thinking I was on another branch.

[dupont-y]

Some new entries added.

[ghost]

👍

[dupont-y]

AS 11.0.0 is out BUT wasn't a formal release (more a tag than anything else), the process is taking much longer than expected.
I suggest to wait some days (I'll send the last round of mails) and merge this part. Some authors have made modifications to .organisationmap and files are becominc to diverge.

[dupont-y]

Mails for a390e8e..2680cb4 were sent yesterday evening.

[ghost]

can I merge that now ?

[theanalyst]

@dachary I guess yann is on vacation (he emailed in the community list a few days ago) and since the pr has been around for sometime I guess we can merge?

[dupont-y]

Le 16/08/16 à 16:27, Abhishek L a écrit :

@dachary https://github.com/dachary I guess yann is on vacation (he
emailed in the community list a few days ago) and since the pr has
been around for sometime I guess we can merge?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#9301 (comment), or
mute the thread
https://github.com/notifications/unsubscribe-auth/AGvyZtjpBDxsWqInLh9eIfbsFRZvhzxpks5qgci9gaJpZM4Il6b3.

Well, I'm back now, but not full throttle :) Won't be connected all this
week-end. Next week will be normal.
merge could be a good idea, I could normalize all new changes against it
without having to worry of merge conflicts.

Cheers,

[theanalyst]

@dachary @dupont-y I guess then it is ok to merge changes until this point, before someone else submits another change in mailmap :) we can have a new pr for any more newer changes

[ghost]

jenkins test this please (just to get rid of the red)

[ghost]

@theanalyst you're right. That's a lot of work @dupont-y thanks !

[theanalyst]

Thanks a lot @dupont-y I can imagine a 50 commit pr to be a nice exercise on git rebase ;)

[dupont-y]

Le 29/08/16 à 10:59, Loic Dachary a écrit :

@theanalyst https://github.com/theanalyst you're right. That's a
/lot/ of work @dupont-y https://github.com/dupont-y thanks !

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9301 (comment), or
mute the thread
https://github.com/notifications/unsubscribe-auth/AGvyZmyk6r9v3x0WziK_tZuBdNqu2WVqks5qkp95gaJpZM4Il6b3.

Hi loic, thanks for merging that.
Will now finish that work.

Cheers,