From: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Date: Tue, 23 Sep 2014 11:51:23 +0000 (+0530)
Subject: mailmap: Feng Wang affiliation
X-Git-Tag: v0.88~143^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26941eac695713239a79fb578708fcef35315050;p=ceph.git

mailmap: Feng Wang affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index 3f8c0c39dc72..d1fd6998311f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -58,6 +58,7 @@ Greg Farnum <greg@inktank.com> Gregory Farnum <greg@inktank.com>
 Guang Yang <yguang@yahoo-inc.com> Guang Yang <yguang@caughtrealize-dl-vm0.peking.corp.yahoo.com>
 Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
 Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
+Feng Wang <cyclonew@cs.ucsc.edu> cyclonew <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
 Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
 Holger Macht <hmacht@suse.de> <holger@homac.de>
diff --git a/.organizationmap b/.organizationmap
index 483d93368fef..da27ce310033 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -235,6 +235,7 @@ UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Carlos Maltzahn <carlosm@cs.ucsc.edu>
+University of California, Santa Cruz <contact@cs.ucsc.edu> Feng Wang <cyclonew@cs.ucsc.edu>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Joe Buck <jbbuck@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Noah Watkins <noahwatkins@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Scott A. Brandt <scott@cs.ucsc.edu>