From fbbe5b05e8db71dcb96ad699a30d6edc4b94d830 Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 28 Aug 2015 12:46:14 +0200
Subject: [PATCH] mailmap: make h3c mailmap more robust

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---
 .mailmap | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index fc7a27fab21..a59fa711fe6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,7 +34,7 @@ Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
 Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
 Casey Marshall <csm@soe.ucsc.edu> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
-Ce Gu <guce@h3c.com> guce <guce@h3c.com>
+Ce Gu <guce@h3c.com> <guce@h3c.com>
 Chendi Xue <chendi.xue@intel.com> Chendi.Xue <chendi.xue@intel.com>
 Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
 Cheng Cheng <ccheng.leo@gmail.com> cchengleo <ccheng.leo@gmail.com>
@@ -53,7 +53,7 @@ David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
 Dmitry Yatsushkevich <dyatsushkevich@mirantis.com> <dmitry.yatsushkevich@gmail.com>
 Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
-Donghai Xu <xu.donghai@h3c.com> x11507 <xu.donghai@h3c.com>
+Donghai Xu <xu.donghai@h3c.com> <xu.donghai@h3c.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
@@ -127,7 +127,7 @@ Loic Dachary <ldachary@redhat.com> <dachary@users.noreply.github.com>
 Loic Dachary <ldachary@redhat.com> <ldachary@dachary.org>
 Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
-Lu Shi <shi.lu@h3c.com> s09816 <shi.lu@h3c.com>
+Lu Shi <shi.lu@h3c.com> <shi.lu@h3c.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>
 Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
@@ -140,10 +140,10 @@ Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>
 Michael Riederer <michael@riederer.org> dynamike67 <michael@riederer.org>
 Michael Rodriguez <michael@newdream.net> <michael@newdream.net>
 Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
-Mingyue Zhao <zhao.mingyue@h3c.com> mingyuez <zhao.mingyue@h3c.com>
+Mingyue Zhao <zhao.mingyue@h3c.com> <zhao.mingyue@h3c.com>
 Mykola Golub <mgolub@mirantis.com> Mykola Golub <mgolub@zhuzha.mirantis.lviv.net>
 Nathan Cutler <ncutler@suse.com> <ncutler@suse.cz>
-Na Xie <xie.na@h3c.com> x11562 <xie.na@h3c.com>
+Na Xie <xie.na@h3c.com> <xie.na@h3c.com>
 Neha Ummareddy <nehaummareddy@gmail.com> nehaummareddy <nehaummareddy@gmail.com>
 Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
 Ning Yao <yaoning@ruijie.com.cn> <zay11022@gmail.com>
@@ -155,7 +155,7 @@ Patrick McGarry <patrick@inktank.com> scuttlemonkey <patrick@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
 Pavan Rallabhandi <pavan.rallabhandi@sandisk.com> Pavan Rallabhandi <pavanrallabhandis@gmail.com>
 Pete Zaitcev <zaitcev@redhat.com> <zaitcev@kotori.zaitcev.us>
-Qiankun Zheng <zheng.qiankun@h3c.com> zqkqkz  <zheng.qiankun@h3c.com>
+Qiankun Zheng <zheng.qiankun@h3c.com> <zheng.qiankun@h3c.com>
 Riccardo Ferretti <rferrett@soe.ucsc.edu> rferrett <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
 Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
 Robert Jansen <r.jansen@fairbanks.nl> <r.jansen86@gmail.com>
@@ -163,7 +163,7 @@ Robin Dehu <robindehu@gmail.com> <rdehu@prune>
 Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Ross Turk <ross.turk@inktank.com> <ross@inktank.com> 
 Ross Turk <ross.turk@inktank.com> <ross.turk@dreamhost.com>
-Ruifeng Yang <yangruifeng.09209@h3c.com> Ruifeng Yang <149233652@qq.com>
+Ruifeng Yang <yangruifeng.09209@h3c.com> <149233652@qq.com>
 Sage Weil <sage@inktank.com> <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sage Weil <sage@inktank.com> <sage@ceph0.dreamhost.com>
 Sage Weil <sage@inktank.com> <sage@foil.westwood.newdream.net>
@@ -220,15 +220,15 @@ Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
 Walter Huf <hufman@gmail.com> Walter J. Huf <hufman@gmail.com>
 Wang, Yaguang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
 Warren Usui <warren.usui@inktank.com> wusui <warren.usui@inktank.com>
-Weijun Duan <duanweijun@h3c.com> duanweijun <duanweijun@h3c.com>
+Weijun Duan <duanweijun@h3c.com> <duanweijun@h3c.com>
 Wei Luo <luowei@yahoo-inc.com> luowei <luowei@yahoo-inc.com>
 Wido den Hollander <wido@42on.com> <wido@widodh.nl>
 Xan Peng <xanpeng@gmail.com> xan <xanpeng@gmail.com>
 Xavier Roche <roche+git@exalead.com> <roche@httrack.com>
-Xiaowei Chen <chen.xiaowei@h3c.com> shawn chen <cxwshawn@gmail.com>
+Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
 Xie Rui <875016668@qq.com> Jerry7X <875016668@qq.com>
 Xingyi Wu <wuxingyi2015@outlook.com>
-Xuan Liu <liu.xuan@h3c.com> l11625 <liu.xuan@h3c.com>
+Xuan Liu <liu.xuan@h3c.com> <liu.xuan@h3c.com>
 Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng Yan <zheng.z.yan@intel.com>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
@@ -246,7 +246,7 @@ Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@rehat.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <ysadeh@redhat.com>
 Yongyue Sun <abioy.sun@gmail.com> Abioy <abioy.sun@gmail.com>
 Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
-Zengran Zhang <zhangzengran@h3c.com> Aran85 <zhangzengran@h3c.com>
+Zengran Zhang <zhangzengran@h3c.com> <zhangzengran@h3c.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> Zhi Z Zhang <zhangz@yahoo-inc.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
-- 
2.47.3