]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mailmap: Thomas Bechtold affiliation
authorLoic Dachary <loic@dachary.org>
Mon, 27 Jan 2014 04:20:16 +0000 (05:20 +0100)
committerLoic Dachary <loic@dachary.org>
Thu, 30 Jan 2014 20:12:24 +0000 (21:12 +0100)
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>
.mailmap
.organizationmap

index 350dca416bef120aa7a604727199501d5dfb9304..22deb996cc0322431a13658ce500d0f2d15dc675 100644 (file)
--- 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>
index fb0c470725414f88fce9ad4065af0333d37b4c23..8ec5b4c65bc4937098a72d961904f79a99b3d102 100644 (file)
@@ -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>