From: Yann Dupont <yann@objoo.org>
Date: Fri, 19 Dec 2014 22:28:33 +0000 (+0100)
Subject: mailmap: Chris Holcombe affiliation
X-Git-Tag: v0.92~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3223%2Fhead;p=ceph.git

mailmap: Chris Holcombe affiliation
---

diff --git a/.mailmap b/.mailmap
index ccd188f2a87..fe6dd406dc8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@ Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a
 Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
 Chendi Xue <chendi.xue@intel.com> Chendi.Xue <chendi.xue@intel.com>
 Cheng Cheng <ccheng.leo@gmail.com> cchengleo <ccheng.leo@gmail.com>
+Chris Holcombe <chris.holcombe@nebula.com> cholcombe973 <xfactor973@gmail.com>
 Christian Brunner <christian@brunner-muc.de> <chb@muc.de> 
 Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
 Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index 3872b91cb39..3b18e853d73 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -136,6 +136,7 @@ Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.co
 Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
 Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
 MIT Computer Science and Artificial Intelligence Laboratory <webmaster@csail.mit.edu> Stephen Jahl <stephenjahl@gmail.com>
+Nebula <info@nebula.com> Chris Holcombe <chris.holcombe@nebula.com>
 Opower <contact@opower.com> Derrick Schneider <derrick.schneider@opower.com>
 Pacific Northwest National Laboratory <contact@pnl.gov> Brown, David M JR <david.brown@pnl.gov>
 Pacific Northwest National Laboratory <contact@pnl.gov> Erwin, Brock A <Brock.Erwin@pnl.gov>