openstack
/
mistral
Code Issues Proposed changes

.mailmap for pbr AUTHORS upate 

The AUTHORS file is regenerated by pbr automatically. There are a few
duplicate names in the git log history which caused the file to end up
with duplicates.
Additionaly some person haven't configured their git client to use First
Name / Last Name.

Introduce /.mailmap which pbr reads to alias or combine emails, see for
example:
https://github.com/openstack-dev/pbr/blob/master/.mailmap

When combining email addresses I took the one that had the most commit:

   2 Author: Lakshmi Kannan <lakshmi@stackstorm.com>
   1 Author: Lakshmi Kannan <lakshmi+github@lakshmikannan.me>

  21 Author: Winson Chan <wcchan@stackstorm.com>
   9 Author: Winson Chan <m4d.coder@gmail.com>
   4 Author: W Chan <wcchan@stackstorm.com>

The previous four last entries have been moved to match alphabetical
ordering.

Add myself since this patch is part of the repository.

Change-Id: I46b1e0e97bab87664a1c7a188898e52512b2fdf0
This commit is contained in:
Antoine Musso 2015-09-17 16:43:39 +02:00 committed by Renat Akhmerov
parent 1d293aced5
commit b074746b62
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.mailmap Normal file
View File

@ -0,0 +1,19 @@
# Format is:
# <preferred e-mail> <other e-mail 1>
# <preferred e-mail> <other e-mail 2>
Bryan Havenstein <bryan.havenstein@ericsson.com>
David Charles Kennedy <dkennedy@hp.com>
Dmitri Zimine <dz@stackstorm.com>
Lakshmi Kannan <lakshmi@stackstorm.com> <lakshmi+github@lakshmikannan.me>
Lingxian Kong <konglingxian@huawei.com>
Lingxian Kong <konglingxian@huawei.com> <anlin.kong@gmail.com>
Liu Sheng <liusheng@huawei.com>
Manas Kelshikar <manas@stackstorm.com>
Noa Koffman <noa.koffman@alcatel-lucent.com>
Renat Akhmerov <rakhmerov@mirantis.com>
Rico Lin <rico.lin.guanyu@gmail.com>
Timur Nurlygayanov <tnurlygayanov@mirantis.com>
Venkata Mahesh Kotha <venkatamaheshkotha@gmail.com>
Winson Chan <wcchan@stackstorm.com> <m4d.coder@gmail.com>
Winson Chan <wcchan@stackstorm.com> <wcchan@stackstorm.com>
Zhu Rong <zhu.rong@99cloud.net>

14
AUTHORS
View File

@ -3,9 +3,13 @@ Alexander Kuznetsov <akuznetsov@mirantis.com>
Anastasia Kuznetsova <akuznetsova@mirantis.com>
Angus Salkeld <angus.salkeld@rackspace.com>
Ankita Wagh <ankita_wagh@symmactoolkit-c02lr80ufd57.symc.symantec.com>
Antoine Musso <hashar@free.fr>
Boris Pavlovic <boris@pavlovic.me>
Bryan Havenstein <bryan.havenstein@ericsson.com>
Christian Berendt <berendt@b1-systems.de>
Claudiu Belu <cbelu@cloudbasesolutions.com>
David C Kennedy <david.c.kennedy@hp.com>
David Charles Kennedy <dkennedy@hp.com>
Dmitri Zimine <dz@stackstorm.com>
Doug Hellmann <doug@doughellmann.com>
Ed Cranford <ed.cranford@rackspace.com>
@ -15,19 +19,21 @@ Kirill Izotov <enykeev@stackstorm.com>
Lakshmi Kannan <lakshmi@stackstorm.com>
Limor Stotland <limor.bortman@alcatel-lucent.com>
Lingxian Kong <konglingxian@huawei.com>
Liu Sheng <liusheng@huawei.com>
Manas Kelshikar <manas@stackstorm.com>
Moshe Elisha <moshe.elisha@alcatel-lucent.com>
Nikolay Mahotkin <nmakhotkin@mirantis.com>
Noa Koffman <noa.koffman@alcatel-lucent.com>
Pierre-Arthur MATHIEU <pierre-arthur.mathieu@hp.com>
Ray Chen <chenrano2002@gmail.com>
Renat Akhmerov <rakhmerov@mirantis.com>
Rico Lin <rico.lin.guanyu@gmail.com>
Rinat Sabitov <rinat.sabitov@gmail.com>
Sergey Kolekonov <skolekonov@mirantis.com>
Sergey Murashov <smurashov@mirantis.com>
Timur Nurlygayanov <tnurlygayanov@mirantis.com>
Venkata Mahesh Kotha <venkatamaheshkotha@gmail.com>
Winson Chan <wcchan@stackstorm.com>
Zhenguo Niu <niuzhenguo@huawei.com>
ZhiQiang Fan <zhiqiang.fan@huawei.com>
Bryan Havenstein <bryan.havenstein@ericsson.com>
Liu Sheng <liusheng@huawei.com>
Noa Koffman <noa.koffman@alcatel-lucent.com>
Rico Lin <rico.lin.guanyu@gmail.com>
Zhu Rong <zhu.rong@99cloud.net>