From: Loic Dachary <loic@dachary.org>
Date: Thu, 29 May 2014 19:41:21 +0000 (+0200)
Subject: mailmap: Ailing Zhang affiliation
X-Git-Tag: v0.83~59^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78f94a9021a9ffd7804cd5c9a546c8e832934214;p=ceph.git

mailmap: Ailing Zhang affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 3f0cb6ee5496..e70cbee29ff7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -131,3 +131,4 @@ Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.c
 Michael Riederer <michael@riederer.org> dynamike67 <michael@riederer.org>
 Ilya Dryomov <ilya.dryomov@inktank.com> <idryomov@gmail.com>
 Aristoteles Neto <aristoteles.neto@webdrive.co.nz>  <wdneto@users.noreply.github.com>
+Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
diff --git a/.organizationmap b/.organizationmap
index 67b19b64e94b..da672285b9da 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -72,6 +72,7 @@ Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9
 Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
 Unaffiliated <no@organization.net> Michael Nelson <mikenel@tnld.net>
 Unaffiliated <no@organization.net> Florent Bautista <florent@coppint.com>
+Unaffiliated <no@organization.net> Ailing Zhang <zhangal1992@gmail.com> 
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
 Unaffiliated <no@organization.net> Michael Riederer <michael@riederer.org>
 Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>