X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=.mailmap;h=afb8ebc2ecfd21a6705d92924ebc60796b8ceb63;hp=2b34efe3b9c1b01e27276f5d785d428e8b36bd11;hb=d6ce546eb7e250237141d3a11380f9d5389c50eb;hpb=92b664139c1d075841a318cd4c23eb0169689a38

diff --git a/.mailmap b/.mailmap
index 2b34efe..afb8ebc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,96 +2,129 @@
 #Proper Name <proper@email.xx> <commit@email.xx>
 #Proper Name <proper@email.xx> Proper Name <commit@email.xx>
 
-# Remap to Whamcloud2
-Alex Zhuravlev <bzzz@whamcloud.com> <alexey.zhuravlev@intel.com>
-Amir Shehata <ashehata@whamcloud.com> <amir.shehata@intel.com>
-Andreas Dilger <adilger@whamcloud.com> <andreas.dilger@intel.com>
-Andreas Dilger <adilger@whamcloud.com> <adilger@dilger.ca>
-Bobi Jam <bobijam@whamcloud.com> <bobijam.xu@intel.com>
-Emoly Liu <emoly@whamcloud.com> <emoly.liu@intel.com>
-Hongchao Zhang <hongchao.zhang@whamcloud.com> <hongchao.zhang@intel.com>
-Jian Yu <yujian@whamcloud.com> <jian.yu@intel.com>
-John L. Hammond <jhammond@whamcloud.com> <john.hammond@intel.com>
-Joseph Gmitter <jgmitter@whamcloud.com> <joseph.gmitter@intel.com>
-Lai Siyao <lai.siyao@whamcloud.com> <lai.siyao@intel.com>
-Li Dongyang <dongyangli@ddn.com> <dongyang.li@anu.edu.au>
-Li Dongyang <dongyangli@ddn.com> <dongyangli@ddn.com>
-Li Xi <lixi@ddn.com> <pkuelelixi@gmail.com>
-Mikhail Pershin <mpershin@whamcloud.com> <mike.pershin@intel.com>
-Mikhail Pershin <mpershin@whamcloud.com> Mike Pershin <mpershin@whamcloud.com>
-Minh Diep <mdiep@whamcloud.com> <minh.diep@intel.com>
-Nathaniel Clark <nclark@whamcloud.com> <nathaniel.l.clark@intel.com>
-Oleg Drokin <green@whamcloud.com> <oleg.drokin@intel.com>
-Sonia Sharma <sharmaso@whamcloud.com> <sonia.sharma@intel.com>
-Wang Shilong <wshilong@whamcloud.com> wshilong@ddn.com>
-Wei Liu <sarah@whamcloud.com> <wei3.liu@intel.com>
-Yang Sheng <ys@whamcloud.com> <yang.sheng@intel.com>
+# Remap CVS to CFS
+Alexander Zarochentsev <zam@clusterfs.com> <zam>
+Alexey Lyashkov <shadow@clusterfs.com> <shadow>
+Alex Zhuravlev <alex@clusterfs.com> <alex_tomas>
+Andreas Dilger <adilger@clusterfs.com <uid707>
+Andreas Dilger <adilger@clusterfs.com> <adilger>
+Andrew Perepechko <panda@clusterfs.com> <panda>
+Bobi Jam <bobijam@clusterfs.com> <bobijam>
+Brian J. Murrell <brian@clusterfs.com> <brian>
+Cliff White <cliffw@clusterfs.com> <cliffw>
+Eric Barton <eeb@clusterfs.com> <eeb>
+Eric Mei <ericm@clusterfs.com> <ericm>
+Eric Mei <ericm@clusterfs.com> <meijia>
+Hongchao Zhang <zhanghc@clusterfs.com> <zhanghc>
+Isaac Huang <isaac@clusterfs.com> <isaac>
+Jian Yu <yujian@clusterfs.com> <yujian>
+Jinshan Xiong <jay@clusterfs.com> <jxiong>
+Johann Lombardi <johann@clusterfs.com> <johann>
+Lai Siyao <lsy@clusterfs.com> <lsy>
+Liang Zhen <liang@clusterfs.com> <liangzhen>
+Liu Ying <emoly@clusterfs.com> <liuy>
+Mike Shaver <shaver@clusterfs.com> <shaver>
+Mike Shaver <shaver@clusterfs.com> <uid23919>
+Mikhail Pershin <tappro@clusterfs.com> <tappro>
+Nathan Rutman <nathan@clusterfs.com> <nathan>
+Nic Henke <nic@clusterfs.com> <nic>
+Nikita Danilov <nikita@clusterfs.com> <nikita>
+Niu Yawei <niu@clusterfs.com> <niu>
+Oleg Drokin <green@clusterfs.com> <green>
+Peter Braam <braam@clusterfs.com> <braam>
+Peter Braam <braam@clusterfs.com> <uid34591>
+Phil Schwan <phil@clusterfs.com> <phil>
+Phil Schwan <phil@clusterfs.com> <pschwan>
+Robert Read <rread@clusterfs.com> <rread>
+Robert Read <rread@clusterfs.com> <robert.read>
+Robert Read <rread@clusterfs.com> <uid723>
+Vitaly Fertman <vitaly@clusterfs.com> <vitaly>
+Vladimir Saveliev <vs@clusterfs.com> <vs>
+Walter Poxon <walter@clusterfs.com> <walter>
+Wang Di <wangdi@clusterfs.com> <wangdi>
+Wang Di <wangdi@clusterfs.com> <uid721>
+Wang Yibin <wangyb@clusterfs.com> <wangyb>
+Yang Sheng <yangsheng@clusterfs.com> <yangsheng>
+Yong Fan <fanyong@clusterfs.com> <fanyong>
+Yury Umanets <yury@clusterfs.com> <yury>
+Zach Brown <zab@clusterfs.com> <zab>
 
-# Remap to Intel
-#Alex Zhuravlev <alexey.zhuravlev@intel.com> <bzzz@whamcloud.com>
-Andreas Dilger <andreas.dilger@intel.com> Anreas Dilger <andreas.dilger@intel.com>
-#Andreas Dilger <andreas.dilger@intel.com> <adilger@whamcloud.com>
-Bob Glossman <bob.glossman@intel.com> <bogl@whamcloud.com>
-#Bobi Jam <bobijam.xu@intel.com> <bobijam@whamcloud.com>
-Brian J. Murrell <brian.murrell@intel.com> <brian@whamcloud.com>
-Bruno Faccini <bruno.faccini@intel.com> <bfaccini62@gmail.com>
-Chris Gearing <chris.gearing@intel.com> Chris <chris@whamcloud.com>
-Cliff White <cliff.white@intel.com> <cliffw@whamcloud.com>
-Cliff White <cliff.white@intel.com> <cliffwhi@intel.com>
-Dmitry Eremin <dmitry.eremin@intel.com> <dmiter4ever@gmail.com>
-Doug Oucharek <doug.s.oucharek@intel.com> <doug@whamcloud.com>
-#Emoly Liu <emoly.liu@intel.com> <emoly@whamcloud.com>
-Eric Barton <eric.barton@intel.com> <eeb@intel.com>
-Fan Yong <fan.yong@intel.com> <yong.fan@whamcloud.com>
-#Hongchao Zhang <hongchao.zhang@intel.com> <hongchao.zhang@whamcloud.com>
-#Jian Yu <jian.yu@intel.com> <yujian@whamcloud.com>
-Jinshan Xiong <jinshan.xiong@intel.com> <jay@whamcloud.com>
-Jinshan Xiong <jinshan.xiong@intel.com> Jinshan <jinshan.xiong@intel.com>
-Jinshan Xiong <jinshan.xiong@intel.com> <jinshan.xiong@whamcloud.com>
-Johann Lombardi <johann.lombardi@intel.com> Johann Lombard <johann.lombardi@intel.com>
-Johann Lombardi <johann.lombardi@intel.com> <johann@whamcloud.com>
-John L. Hammond <john.hammond@intel.com> <johnlockwoodhammond@gmail.com>
-#John L. Hammond <john.hammond@intel.com> <jhammond@whamcloud.com>
-Keith Mannthey <keith.mannthey@intel.com> <keith@whamcloud.com>
-Lai Siyao <lai.siyao@intel.com> <laisiyao@whamcloud.com>
-Li Wei <wei.g.li@intel.com> <liwei@whamcloud.com>
-Liang Zhen <liang.zhen@intel.com> <liang@whamcloud.com>
-Mikhail Pershin <mike.pershin@intel.com> <tappro@whamcloud.com>
-Mikhail Pershin <mike.pershin@intel.com> Mike Pershin <mike.pershin@intel.com>
-Mikhail Pershin <mike.pershin@intel.com> Mikhal Pershin <mike.pershin@intel.com>
-#Minh Diep <min.diep@intel.com> <mdiep@whamcloud.com>
-Niu Yawei <niu.yaweh@intel.com> <niu@whamcloud.com>
-#Oleg Drokin <oleg.drokin@intel.com> <green@whamcloud.com>
-Oleg Drokin <oleg.drokin@intel.com> <green@intel.com>
-Richard Henwood <richard.henwood@intel.com> <build@lgit-121.(none)>
-Richard Henwood <richard.henwood@intel.com> <rhenwood@whamcloud.com>
-Robert Read <robert.read@intel.com> <robert.read.@intel.com>
-Sonia Sharma <sonia.sharma@intel.com> Sonia <sonia.sharma@intel.com>
-Sonia Sharma <sonia.sharma@intel.com> sharmaso <sonia.sharma@intel.com>
-Wang Di <di.wang@intel.com> <di.wang@whamcloud.com>
-Wang Di <di.wang@intel.com> wang di <di.wang@intel.com>
-Wang Di <di.wang@intel.com> Di Wang <di.wang@intel.com>
-Wang Di <di.wang@intel.com> wangdi <di.wang@intel.com>
-Wei Liu <wei3.liu@intel.com> <w3liu@unknown000dc5d3c256.gateway.2wire.net>
-#Wei Liu <wei3.liu@intel.com> <sarah@whamcloud.com>
-Wei Li <wei.g.li@intel.com> <liwei@whamcloud.com>
-Yang Sheng <yang.sheng@intel.com> yangsheng <yang.sheng@intel.com>
-Yang Sheng <yang.sheng@intel.com> yang sheng <yang.sheng@intel.com>
-#Yang Sheng <yang.sheng@intel.com> <ys@whamcloud.com>
+# Remap to Sun
+Andreas Dilger <adilger@sun.com> <adilger@clusterfs.com>
+Andrew Perepechko <andrew.perepechko@sun.com> anserper <anserper>
+Andrew Perepechko <andrew.perepechko@sun.com> <panda@clusterfs.com>
+Alexander Zarochentsev <Alexander.Zarochentsev@sun.com> Alexander.Zarochentsev <Alexander.Zarochentsev@sun.com>
+Alexander Zarochentsev <Alexander.Zarochentsev@sun.com> Alexander.Zarochentev <alexander.zarochentev@sun.com>
+Bobi Jam <bobijam@sun.com> <bobijam@clusterfs.com>
+Brian J. Murrell <brian@sun.com> <brian@clusterfs.com>
+Cliff White <cliff.white@sun.com> <cliffw@clusterfs.com>
+Elena Gryaznova <grev@sun.com> <grev>
+Eric Barton <eric.barton@sun.com> <eeb@clusterfs.com>
+Eric Mei <eric.mei@sun.com> <ericm@clusterfs.com>
+Fan Yong <yong.fan@sun.com> <fanyong@clusterfs.com>
+Hongchao Zhang <Hongchao.Zhang@sun.com> hongchao.zhang <Hongchao.Zhang@sun.com>
+Hongchao Zhang <Hongchao.Zhang@sun.com> ZhangHongChao <Hongchao.zhang@sun.com>
+Hongchao Zhang <hongchao.zhang@sun.com> <zhanghc@clusterfs.com>
+Isaac Huang <he.huang@sun.com> <isaac@clusterfs.com>
+Jian Yu <jian.yu@sun.com> <yujian@clusterfs.com>
+Johann Lombardi <johann@sun.com> <johann@clusterfs.com>
+Liang Zhen <liang.zhen@sun.com> <liang@clusterfs.com>
+LiuYing <emoly.liu@sun.com> <emoly@clusterfs.com>
+Mikhail Pershin <tappro@sun.com> <tappro@clusterfs.com>
+Mikhail Pershin <tappro@sun.com> Mike Tappro <tappro@sun.com>
+Mikhail Pershin <tappro@sun.com> Mike Tappro <tappro@garden.(none)>
+Nathan Rutman <nathan.rutman@sun.com> <nathan@clusterfs.com>
+Nicolas Williams <nicolas.williams@sun.com> nicolas.williams <nicolas.williams>
+Nicolas Williams <nicolas.williams@sun.com> <root@vl1.(none)>
+Niu Yawei <niu.yawei@sun.com> <niu@clusterfs.com>
+Oleg Drokin <oleg.drokin@sun.com> <green@clusterfs.com>
+Oleg Drokin <oleg.drokin@sun.com> <green@linuxhacker.ru>
+Pravin Shelar <Pravin.Shelar@sun.com> <pravin>
+Pravin Shelar <Pravin.Shelar@sun.com> <pravins>
+Pravin Shelar <Pravin.Shelar@sun.com> pravin <Pravin.Shelar@sun.com>
+Ricardo M. Correia <ricardo.correia@sun.com> <rcorreia>
+Robert Read <robert.read@sun.com> <rread@clusterfs.com>
+Robert Read <robert.read@sun.com> <rread@vpn-129-150-244-142.sfbay.sun.com>
+Vitaly Fertman <vitaly.fertman@sun.com> <vitaly@clusterfs.com>
+Wang Yibin <wang.yibin@oracle.com>
+Wang Di <tom.wang@sun.com> <wangdi@clusterfs.com>
+Wang Di <tom.wang@sun.com> Tom.Wang <Tom.Wang@sun.com>
+Yang Sheng <sheng.yang@sun.com> <yangsheng@clusterfs.com>
+Yang Sheng <sheng.yang@sun.com> yangsheng <sheng.yang@sun.com>
 
-# Remap to Cray
-Alexandr Boyko <c17825@cray.com> <alexander.boyko@seagate.com>
-Alexander Zarochentsev <c17826@cray.com> <alexander.zarochentsev@seagate.com>
-Alexey Lyashkov <c17817@cray.com> <alexey.lyashkov@seagate.com>
-Andrew Perepechko <c17827@cray.com> <andrew.perepechko@seagate.com>
-Andriy Skulysh <c17819@cray.com> <andriy.skulysh@seagate.com>
-Artem Blagodarenko <c17828@cray.com> <artem.blagodarenko@seagate.com>
-Elena Gryaznova <c17455@cray.com> <elena.gryaznova@seagate.com>
-Elena Gryaznova <c17455@cray.com> Elena V. Gryaznova <c17455@cray.com>
-Nathan Rutman <nrutman@cray.com> <nathan.rutman@seagate.com>
-Sergey Cheremencev <c17829@cray.com> <sergey.cheremencev@seagate.com>
-Vitaly Fertman <c17818@cray.com> <vitaly.fertman@seagate.com>
-Vladimir Saveliev <c17830@cray.com> <vladimir.saveliev@seagate.com>
+# Remap to Oracle
+Alex Zhuravlev <alexey.zhuravlev@oracle.com> <alex@clusterfs.com>
+Andreas Dilger <andreas.dilger@oracle.com> <adilger@sun.com>
+Andreas Dilger <andreas.dilger@oracle.com> <adilger@mookie.adilger.int>
+Andrew Perepechko <andrew.perepechko@oracle.com> <andrew.perepechko@sun.com>
+Brian J. Murrell <brian.murrell@oracle.com> <brian@sun.com>
+Cliff White <cliff.white@oracle.com> <cliff.white@sun.com>
+Dmitry Zogin <dmitry.zoguine@oracle.com> dzogin <dmitri.zoguine@sun.com>
+Elena Gryaznova <elena.gryaznova@oracle.com> <grev@sun.com>
+Eric Barton <eric.barton@oracle.com> <eric.barton@sun.com>
+Eric Mei <eric.mei@oracle.com> <eric.mei@sun.com>
+LiuYing <emoly.liu@oracle.com> <emoly.liu@sun.com>
+Isaac Huang <he.h.huang@oracle.com> <he.huang@sun.com>
+Jian Yu <jian.yu@oracle.com> <jian.yu@sun.com>
+Jinshan Xiong <jinshan.xiong@oracle.com> Jay Xiong <jinshan.xiong@sun.com>
+Johann Lombardi <johann.lombardi@oracle.com> <johann@sun.com>
+Landen Tian <zhiyong.tian@oracle.com> <landen@sun.com>
+Landen Tian <zhiyong.tian@oracle.com> Landen <zhiyong.tian@oracle.com>
+LiuYing <emoly.liu@oracle.com> <emoly.liu@sun.com>
+Mikhail Pershin <mikhail.pershin@oracle.com> <tappro@sun.com>
+Minh Diep <minh.diep@oracle.com> <minhdiep@lts-head.co.cfs>
+Minh Diep <minh.diep@oracle.com> <minh@clusterfs.com>
+Nathan Rutman <nathan.rutman@oracle.com> <nathan.rutman@sun.com>
+Oleg Drokin <oleg.drokin@oracle.com> <oleg.drokin@sun.com>
+Ricardo M. Correia <ricardo.correia@oracle.com> <ricardo.correia@sun.com>
+Robert Read <robert.read@oracle.com> <rread@sun.com>
+Terry Rutledge <terry.rutledge@oracle.com> <stinson1947>
+Terry Rutledge <terry.rutledge@oracle.com> <terry@.(none)>
+Vitaly Fertman <vitaly.fertman@oracle.com> <vitaly.fertman@sun.com>
+Wang Di <di.wang@oracle.com> Tom.Wang <Tom.Wang@sun.com>
+Wang Di <di.wang@oracle.com> di wang <di.wang@oracle.com>
+Yang Sheng <sheng.yang@oracle.com> <sheng.yang@sun.com>
+Yang Sheng <sheng.yang@oracle.com> yangsheng <sheng.yang@oracle.com>
 
 # Remap to Seagate
 Alexander Boyko <alexander.boyko@seagate.com> <alexander_boyko@xyratex.com>
@@ -117,6 +150,20 @@ Vitaly Fertman <vitaly.fertman@seagate.com> <vitaly_fertman@xyratex.com>
 Vinayakswami Hariharmath <vinayakswami.hariharmath@seagate.com> <vinayakswami.hariharmath@clogeny.com>
 Vladimir Saveliev <vladimir.saveliev@seagate.com> <vladimir_saveliev@xyratex.com>
 
+# Remap to Cray
+Alexandr Boyko <c17825@cray.com> <alexander.boyko@seagate.com>
+Alexander Zarochentsev <c17826@cray.com> <alexander.zarochentsev@seagate.com>
+Alexey Lyashkov <c17817@cray.com> <alexey.lyashkov@seagate.com>
+Andrew Perepechko <c17827@cray.com> <andrew.perepechko@seagate.com>
+Andriy Skulysh <c17819@cray.com> <andriy.skulysh@seagate.com>
+Artem Blagodarenko <c17828@cray.com> <artem.blagodarenko@seagate.com>
+Elena Gryaznova <c17455@cray.com> <elena.gryaznova@seagate.com>
+Elena Gryaznova <c17455@cray.com> Elena V. Gryaznova <c17455@cray.com>
+Nathan Rutman <nrutman@cray.com> <nathan.rutman@seagate.com>
+Sergey Cheremencev <c17829@cray.com> <sergey.cheremencev@seagate.com>
+Vitaly Fertman <c17818@cray.com> <vitaly.fertman@seagate.com>
+Vladimir Saveliev <c17830@cray.com> <vladimir.saveliev@seagate.com>
+
 # Remap to Whamcloud
 Alex Zhuravlev <bzzz@whamcloud.com> <alexey.zhuravlev@oracle.com>
 Andreas Dilger <adilger@whamcloud.com> <andreas.dilger@oracle.com>
@@ -157,138 +204,92 @@ Yang Sheng <ys@whamcloud.com> <sheng.yang@oracle.com>
 Yang Sheng <ys@whamcloud.com> yang sheng <ys@whamcloud.com>
 Yang Sheng <ys@whamcloud.com> YangSheng <ys@whamcloud.com>
 
-# Remap to Oracle
-Alex Zhuravlev <alexey.zhuravlev@oracle.com> <alex@clusterfs.com>
-Andreas Dilger <andreas.dilger@oracle.com> <adilger@sun.com>
-Andreas Dilger <andreas.dilger@oracle.com> <adilger@mookie.adilger.int>
-Andrew Perepechko <andrew.perepechko@oracle.com> <andrew.perepechko@sun.com>
-Brian J. Murrell <brian.murrell@oracle.com> <brian@sun.com>
-Cliff White <cliff.white@oracle.com> <cliff.white@sun.com>
-Dmitry Zogin <dmitry.zoguine@oracle.com> dzogin <dmitri.zoguine@sun.com>
-Elena Gryaznova <elena.gryaznova@oracle.com> <grev@sun.com>
-Eric Barton <eric.barton@oracle.com> <eric.barton@sun.com>
-Eric Mei <eric.mei@oracle.com> <eric.mei@sun.com>
-LiuYing <emoly.liu@oracle.com> <emoly.liu@sun.com>
-Isaac Huang <he.h.huang@oracle.com> <he.huang@sun.com>
-Jian Yu <jian.yu@oracle.com> <jian.yu@sun.com>
-Jinshan Xiong <jinshan.xiong@oracle.com> Jay Xiong <jinshan.xiong@sun.com>
-Johann Lombardi <johann.lombardi@oracle.com> <johann@sun.com>
-Landen Tian <zhiyong.tian@oracle.com> <landen@sun.com>
-Landen Tian <zhiyong.tian@oracle.com> Landen <zhiyong.tian@oracle.com>
-LiuYing <emoly.liu@oracle.com> <emoly.liu@sun.com>
-Mikhail Pershin <mikhail.pershin@oracle.com> <tappro@sun.com>
-Minh Diep <minh.diep@oracle.com> <minhdiep@lts-head.co.cfs>
-Minh Diep <minh.diep@oracle.com> <minh@clusterfs.com>
-Nathan Rutman <nathan.rutman@oracle.com> <nathan.rutman@sun.com>
-Oleg Drokin <oleg.drokin@oracle.com> <oleg.drokin@sun.com>
-Ricardo M. Correia <ricardo.correia@oracle.com> <ricardo.correia@sun.com>
-Robert Read <robert.read@oracle.com> <rread@sun.com>
-Terry Rutledge <terry.rutledge@oracle.com> <stinson1947>
-Terry Rutledge <terry.rutledge@oracle.com> <terry@.(none)>
-Vitaly Fertman <vitaly.fertman@oracle.com> <vitaly.fertman@sun.com>
-Wang Di <di.wang@oracle.com> Tom.Wang <Tom.Wang@sun.com>
-Wang Di <di.wang@oracle.com> di wang <di.wang@oracle.com>
-Yang Sheng <sheng.yang@oracle.com> <sheng.yang@sun.com>
-Yang Sheng <sheng.yang@oracle.com> yangsheng <sheng.yang@oracle.com>
-
-# Remap to Sun
-Andreas Dilger <adilger@sun.com> <adilger@clusterfs.com>
-Andrew Perepechko <andrew.perepechko@sun.com> anserper <anserper>
-Andrew Perepechko <andrew.perepechko@sun.com> <panda@clusterfs.com>
-Alexander Zarochentsev <Alexander.Zarochentsev@sun.com> Alexander.Zarochentsev <Alexander.Zarochentsev@sun.com>
-Alexander Zarochentsev <Alexander.Zarochentsev@sun.com> Alexander.Zarochentev <alexander.zarochentev@sun.com>
-Bobi Jam <bobijam@sun.com> <bobijam@clusterfs.com>
-Brian J. Murrell <brian@sun.com> <brian@clusterfs.com>
-Cliff White <cliff.white@sun.com> <cliffw@clusterfs.com>
-Elena Gryaznova <grev@sun.com> <grev>
-Eric Barton <eric.barton@sun.com> <eeb@clusterfs.com>
-Eric Mei <eric.mei@sun.com> <ericm@clusterfs.com>
-Fan Yong <yong.fan@sun.com> <fanyong@clusterfs.com>
-Hongchao Zhang <Hongchao.Zhang@sun.com> hongchao.zhang <Hongchao.Zhang@sun.com>
-Hongchao Zhang <Hongchao.Zhang@sun.com> ZhangHongChao <Hongchao.zhang@sun.com>
-Hongchao Zhang <hongchao.zhang@sun.com> <zhanghc@clusterfs.com>
-Isaac Huang <he.huang@sun.com> <isaac@clusterfs.com>
-Jian Yu <jian.yu@sun.com> <yujian@clusterfs.com>
-Johann Lombardi <johann@sun.com> <johann@clusterfs.com>
-Liang Zhen <liang.zhen@sun.com> <liang@clusterfs.com>
-LiuYing <emoly.liu@sun.com> <emoly@clusterfs.com>
-Mikhail Pershin <tappro@sun.com> <tappro@clusterfs.com>
-Mikhail Pershin <tappro@sun.com> Mike Tappro <tappro@sun.com>
-Mikhail Pershin <tappro@sun.com> Mike Tappro <tappro@garden.(none)>
-Nathan Rutman <nathan.rutman@sun.com> <nathan@clusterfs.com>
-Nicolas Williams <nicolas.williams@sun.com> nicolas.williams <nicolas.williams>
-Nicolas Williams <nicolas.williams@sun.com> <root@vl1.(none)>
-Niu Yawei <niu.yawei@sun.com> <niu@clusterfs.com>
-Oleg Drokin <oleg.drokin@sun.com> <green@clusterfs.com>
-Oleg Drokin <oleg.drokin@sun.com> <green@linuxhacker.ru>
-Pravin Shelar <Pravin.Shelar@sun.com> <pravin>
-Pravin Shelar <Pravin.Shelar@sun.com> <pravins>
-Pravin Shelar <Pravin.Shelar@sun.com> pravin <Pravin.Shelar@sun.com>
-Ricardo M. Correia <ricardo.correia@sun.com> <rcorreia>
-Robert Read <robert.read@sun.com> <rread@clusterfs.com>
-Robert Read <robert.read@sun.com> <rread@vpn-129-150-244-142.sfbay.sun.com>
-Vitaly Fertman <vitaly.fertman@sun.com> <vitaly@clusterfs.com>
-Wang Yibin <wang.yibin@oracle.com>
-Wang Di <tom.wang@sun.com> <wangdi@clusterfs.com>
-Wang Di <tom.wang@sun.com> Tom.Wang <Tom.Wang@sun.com>
-Yang Sheng <sheng.yang@sun.com> <yangsheng@clusterfs.com>
-Yang Sheng <sheng.yang@sun.com> yangsheng <sheng.yang@sun.com>
+# Remap to Intel
+#Alex Zhuravlev <alexey.zhuravlev@intel.com> <bzzz@whamcloud.com>
+Andreas Dilger <andreas.dilger@intel.com> Anreas Dilger <andreas.dilger@intel.com>
+#Andreas Dilger <andreas.dilger@intel.com> <adilger@whamcloud.com>
+Bob Glossman <bob.glossman@intel.com> <bogl@whamcloud.com>
+#Bobi Jam <bobijam.xu@intel.com> <bobijam@whamcloud.com>
+Brian J. Murrell <brian.murrell@intel.com> <brian@whamcloud.com>
+Bruno Faccini <bruno.faccini@intel.com> <bfaccini62@gmail.com>
+Chris Gearing <chris.gearing@intel.com> Chris <chris@whamcloud.com>
+Cliff White <cliff.white@intel.com> <cliffw@whamcloud.com>
+Cliff White <cliff.white@intel.com> <cliffwhi@intel.com>
+Dmitry Eremin <dmitry.eremin@intel.com> <dmiter4ever@gmail.com>
+Doug Oucharek <doug.s.oucharek@intel.com> <doug@whamcloud.com>
+#Emoly Liu <emoly.liu@intel.com> <emoly@whamcloud.com>
+Eric Barton <eric.barton@intel.com> <eeb@intel.com>
+Fan Yong <fan.yong@intel.com> <yong.fan@whamcloud.com>
+Hongchao Zhang <hongchao.zhang@intel.com> <hongchao.zhang@whamcloud.com>
+#Jian Yu <jian.yu@intel.com> <yujian@whamcloud.com>
+Jinshan Xiong <jinshan.xiong@intel.com> <jay@whamcloud.com>
+Jinshan Xiong <jinshan.xiong@intel.com> Jinshan <jinshan.xiong@intel.com>
+Jinshan Xiong <jinshan.xiong@intel.com> <jinshan.xiong@whamcloud.com>
+Johann Lombardi <johann.lombardi@intel.com> Johann Lombard <johann.lombardi@intel.com>
+Johann Lombardi <johann.lombardi@intel.com> <johann@whamcloud.com>
+John L. Hammond <john.hammond@intel.com> <johnlockwoodhammond@gmail.com>
+#John L. Hammond <john.hammond@intel.com> <jhammond@whamcloud.com>
+Keith Mannthey <keith.mannthey@intel.com> <keith@whamcloud.com>
+Lai Siyao <lai.siyao@intel.com> <laisiyao@whamcloud.com>
+Li Wei <wei.g.li@intel.com> <liwei@whamcloud.com>
+Liang Zhen <liang.zhen@intel.com> <liang@whamcloud.com>
+#Mikhail Pershin <mike.pershin@intel.com> <tappro@whamcloud.com>
+Mikhail Pershin <mike.pershin@intel.com> <mike.pershin@intel.com>
+#Minh Diep <min.diep@intel.com> <mdiep@whamcloud.com>
+Niu Yawei <niu.yaweh@intel.com> <niu@whamcloud.com>
+#Oleg Drokin <oleg.drokin@intel.com> <green@whamcloud.com>
+Oleg Drokin <oleg.drokin@intel.com> <green@intel.com>
+Richard Henwood <richard.henwood@intel.com> <build@lgit-121.(none)>
+Richard Henwood <richard.henwood@intel.com> <rhenwood@whamcloud.com>
+Robert Read <robert.read@intel.com> <robert.read.@intel.com>
+Sonia Sharma <sonia.sharma@intel.com> <sonia.sharma@intel.com>
+Wang Di <di.wang@intel.com> <di.wang@whamcloud.com>
+Wang Di <di.wang@intel.com> <di.wang@intel.com>
+Wei Liu <wei3.liu@intel.com> <w3liu@unknown000dc5d3c256.gateway.2wire.net>
+#Wei Liu <wei3.liu@intel.com> <sarah@whamcloud.com>
+Wei Li <wei.g.li@intel.com> <liwei@whamcloud.com>
+Yang Sheng <yang.sheng@intel.com> <yang.sheng@intel.com>
+#Yang Sheng <yang.sheng@intel.com> <ys@whamcloud.com>
 
-# Remap CVS to CFS
-Alexander Zarochentsev <zam@clusterfs.com> <zam>
-Alexey Lyashkov <shadow@clusterfs.com> <shadow>
-Alex Zhuravlev <alex@clusterfs.com> <alex_tomas>
-Andreas Dilger <adilger@clusterfs.com <uid707>
-Andreas Dilger <adilger@clusterfs.com> <adilger>
-Andrew Perepechko <panda@clusterfs.com> <panda>
-Bobi Jam <bobijam@clusterfs.com> <bobijam>
-Brian J. Murrell <brian@clusterfs.com> <brian>
-Cliff White <cliffw@clusterfs.com> <cliffw>
-Eric Barton <eeb@clusterfs.com> <eeb>
-Eric Mei <ericm@clusterfs.com> <ericm>
-Eric Mei <ericm@clusterfs.com> <meijia>
-Hongchao Zhang <zhanghc@clusterfs.com> <zhanghc>
-Isaac Huang <isaac@clusterfs.com> <isaac>
-Jian Yu <yujian@clusterfs.com> <yujian>
-Jinshan Xiong <jay@clusterfs.com> <jxiong>
-Johann Lombardi <johann@clusterfs.com> <johann>
-Lai Siyao <lsy@clusterfs.com> <lsy>
-Liang Zhen <liang@clusterfs.com> <liangzhen>
-Liu Ying <emoly@clusterfs.com> <liuy>
-Mike Shaver <shaver@clusterfs.com> <shaver>
-Mike Shaver <shaver@clusterfs.com> <uid23919>
-Mikhail Pershin <tappro@clusterfs.com> <tappro>
-Nathan Rutman <nathan@clusterfs.com> <nathan>
-Nic Henke <nic@clusterfs.com> <nic>
-Nikita Danilov <nikita@clusterfs.com> <nikita>
-Niu Yawei <niu@clusterfs.com> <niu>
-Oleg Drokin <green@clusterfs.com> <green>
-Peter Braam <braam@clusterfs.com> <braam>
-Peter Braam <braam@clusterfs.com> <uid34591>
-Phil Schwan <phil@clusterfs.com> <phil>
-Phil Schwan <phil@clusterfs.com> <pschwan>
-Robert Read <rread@clusterfs.com> <rread>
-Robert Read <rread@clusterfs.com> <robert.read>
-Robert Read <rread@clusterfs.com> <uid723>
-Vitaly Fertman <vitaly@clusterfs.com> <vitaly>
-Vladimir Saveliev <vs@clusterfs.com> <vs>
-Walter Poxon <walter@clusterfs.com> <walter>
-Wang Di <wangdi@clusterfs.com> <wangdi>
-Wang Di <wangdi@clusterfs.com> <uid721>
-Wang Yibin <wangyb@clusterfs.com> <wangyb>
-Yang Sheng <yangsheng@clusterfs.com> <yangsheng>
-Yong Fan <fanyong@clusterfs.com> <fanyong>
-Yury Umanets <yury@clusterfs.com> <yury>
-Zach Brown <zab@clusterfs.com> <zab>
+# Remap to Whamcloud2
+Alex Zhuravlev <bzzz@whamcloud.com> <alexey.zhuravlev@intel.com>
+Amir Shehata <ashehata@whamcloud.com> <amir.shehata@intel.com>
+Andreas Dilger <adilger@whamcloud.com> <andreas.dilger@intel.com>
+Andreas Dilger <adilger@whamcloud.com> <adilger@dilger.ca>
+Bobi Jam <bobijam@whamcloud.com> <bobijam.xu@intel.com>
+Emoly Liu <emoly@whamcloud.com> <emoly.liu@intel.com>
+Hongchao Zhang <hongchao@whamcloud.com> <hongchao.zhang@intel.com>
+James Nunez <jnunez@whamcloud.com> <james.a.nunez@intel.com>
+Jian Yu <yujian@whamcloud.com> <jian.yu@intel.com>
+John L. Hammond <jhammond@whamcloud.com> <john.hammond@intel.com>
+Joseph Gmitter <jgmitter@whamcloud.com> <joseph.gmitter@intel.com>
+Lai Siyao <lai.siyao@whamcloud.com> <lai.siyao@intel.com>
+Li Dongyang <dongyangli@ddn.com> <dongyang.li@anu.edu.au>
+Li Dongyang <dongyangli@ddn.com> <dongyangli@ddn.com>
+Li Xi <lixi@ddn.com> <pkuelelixi@gmail.com>
+Mikhail Pershin <mpershin@whamcloud.com> <tappro@whamcloud.com>
+Mikhail Pershin <mpershin@whamcloud.com> <mike.pershin@intel.com>
+Mikhail Pershin <mpershin@whamcloud.com> <mpershin@whamcloud.com>
+Minh Diep <mdiep@whamcloud.com> <minh.diep@intel.com>
+Nathaniel Clark <nclark@whamcloud.com> <nathaniel.l.clark@intel.com>
+Oleg Drokin <green@whamcloud.com> <oleg.drokin@intel.com>
+Patrick Farrell <pfarrell@whamcloud.com> <paf@cray.com>
+Sonia Sharma <sharmaso@whamcloud.com> <sonia.sharma@intel.com>
+Wang Shilong <wshilong@whamcloud.com> wshilong@ddn.com>
+Wei Liu <sarah@whamcloud.com> <wei3.liu@intel.com>
+Yang Sheng <ys@whamcloud.com> <yang.sheng@intel.com>
 
 # Others
 Brian Behlendorf <behlendorf1@llnl.gov> <behlendo>
 Christopher J. Morrone <morrone2@llnl.gov> <morrone>
 Frank Zago <fzago@cray.com> <frank@zago.net>
+Gregoire Pichon <gregoire.pichon@atos.net> <gregoire.pichon@bull.net>
 Jacques-Charles LaFoucriere <jacques-charles.lafoucriere@cea.fr> jcl <jacques-charles.lafoucriere@cea.fr>
 Jacques-Charles LaFoucriere <jacques-charles.lafoucriere@cea.fr> jcl <jc.lafoucriere@cea.fr>
+#James Simmons <simmonsja@ornl.gov> <uja.ornl@yahoo.com>
+#James Simmons <simmonsja@ornl.gov> <uja.ornl@gmail.com>
 James Simmons <uja.ornl@yahoo.com> <uja.ornl@gmail.com>
 Jinshan Xiong <jinshan.xiong@uber.com> <jinshan.xiong@intel.com>
 Jinshan Xiong <jinshan.xiong@uber.com> <jinshan.xiong@gmail.com>
-Ned Bass <bass6@llnl.gov> Ned A. Bass <bass6@llnl.gov>
+Ned Bass <bass6@llnl.gov> <bass6@llnl.gov>
 Thomas Stibor <t.stibor@gsi.de> <thomas@stibor.net>