From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 21 Dec 2015 00:14:37 +0000 (+0100)
Subject: mailmap: Brian Felton affiliation
X-Git-Tag: v10.0.3~145^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2f7fc61c427790cc0f792f5b636e1d2e8bcbf73;p=ceph.git

mailmap: Brian Felton affiliation

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

diff --git a/.mailmap b/.mailmap
index 44c4c1543296..ca26640e0777 100644
--- a/.mailmap
+++ b/.mailmap
@@ -31,6 +31,7 @@ Billy Olsen <billy.olsen@canonical.com> <billy.olsen@gmail.com>
 Bo Cai <cai.bo@h3c.com> caibo <cai.bo@h3c.com>
 Boris Ranto <branto@redhat.com> branto1 <branto@redhat.com>
 Brian Andrus <bandrus@redhat.com> <bandrus+github@gmail.com>
+Brian Felton <bjfelton@gmail.com> <bjfelton@gmail.com>
 Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
 Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de> <Burkhard.Linke@computational.bio.uni-giessen.de>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
diff --git a/.organizationmap b/.organizationmap
index 95e3175b90d3..3cc2e1de935c 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -350,6 +350,7 @@ Unaffiliated <no@organization.net> Arthur Gorjux <arthurgorjux@gmail.com>
 Unaffiliated <no@organization.net> BJ Lougee <almightybeeij@gmail.com>
 Unaffiliated <no@organization.net> Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de>
 Unaffiliated <no@organization.net> Bosse Klykken <larkly@gmail.com>
+Unaffiliated <no@organization.net> Brian Felton <bjfelton@gmail.com>
 Unaffiliated <no@organization.net> Cheng Cheng <ccheng.leo@gmail.com>
 Unaffiliated <no@organization.net> Christos Stavrakakis <stavr.chris@gmail.com>
 Unaffiliated <no@organization.net> Claire Massot <claire.massot93@gmail.com>