From: Loic Dachary <loic@dachary.org>
Date: Mon, 27 Jan 2014 04:20:16 +0000 (+0100)
Subject: mailmap: Thomas Bechtold affiliation
X-Git-Tag: v0.78~243^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5d22eb89ec78b2eb2ad5a856fa0be589f159dda;p=ceph.git

mailmap: Thomas Bechtold affiliation

and canonical name. Also fix the name "Deutsche Telekom"

Reviewed-by: Thomas Bechtold <t.bechtold@telekom.de>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 350dca416bef..22deb996cc03 100644
--- a/.mailmap
+++ b/.mailmap
@@ -85,6 +85,7 @@ Mark Nelson <mark.nelson@inktank.com> <mark.a.nelson@gmail.com>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@ubuntu.(none)>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> tamil <tamil.muthamizhan@inktank.com>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@tamil-VirtualBox.(none)>
+Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
 Christian Brunner <christian@brunner-muc.de> <chb@muc.de> 
 Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
 Alfredo Deza <alfredo.deza@inktank.com> <alfredo@deza.pe>
diff --git a/.organizationmap b/.organizationmap
index fb0c47072541..8ec5b4c65bc4 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -101,7 +101,8 @@ Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
 UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Haomai Wang <haomaiwang@gmail.com>
 UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
-Telekom <contact@telekom.de> Daniel Gollub <d.gollub@telekom.de>
+Deutsche Telekom <contact@telekom.de> Daniel Gollub <d.gollub@telekom.de>
+Deutsche Telekom <contact@telekom.de> Thomas Bechtold <t.bechtold@telekom.de>
 Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.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>