From b074746b624603bf3a0e9bb667a0623ac3f221ce Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@free.fr>
Date: Thu, 17 Sep 2015 16:43:39 +0200
Subject: [PATCH] .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
---
 .mailmap | 19 +++++++++++++++++++
 AUTHORS  | 14 ++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..2b3e1662c
--- /dev/null
+++ b/.mailmap
@@ -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>
diff --git a/AUTHORS b/AUTHORS
index 3f0e958af..3f279da51 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>