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

mailmap: Chris Holcombe name normalization

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

diff --git a/.mailmap b/.mailmap
index 9ec606762ae7..3d83997d94cf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -44,7 +44,7 @@ Chen Dihao <tobeg3oogle@gmail.com> tobe <tobeg3oogle@gmail.com>
 Chendi Xue <chendi.xue@intel.com> Chendi.Xue <chendi.xue@intel.com>
 Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
 Cheng Cheng <ccheng.leo@gmail.com> cchengleo <ccheng.leo@gmail.com>
-Chris Holcombe <chris.holcombe@nebula.com> cholcombe973 <xfactor973@gmail.com>
+Chris Holcombe <chris.holcombe@nebula.com> <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>