[icinga-checkins] icinga.org: icinga2/master: Update .mailmap for Thomas Widhalm

git at icinga.org git at icinga.org
Mon Oct 10 11:13:35 CEST 2016


Module: icinga2
Branch: master
Commit: 53f7481a5f483e459f326f8b34c511def4662bde
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=53f7481a5f483e459f326f8b34c511def4662bde

Author: Gunnar Beutner <gunnar.beutner at icinga.com>
Date:   Mon Oct 10 11:10:56 2016 +0200

Update .mailmap for Thomas Widhalm

refs #12881

---

 .mailmap |    3 ++-
 AUTHORS  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 58d90f3..e8a3310 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,7 +11,8 @@ Markus Waldmüller <markus.waldmueller at netways.de>
 Claudio Kuenzler <ck at claudiokuenzler.com>
 <markus.frosch at icinga.com> <markus at lazyfrosch.de>
 <markus.frosch at icinga.com> <lazyfrosch at icinga.org>
-<thomas.widhalm at netways.de> <widhalmt at widhalmt.or.at>
+<thomas.widhalm at icinga.com> <thomas.widhalm at netways.de>
+<thomas.widhalm at icinga.com> <widhalmt at widhalmt.or.at>
 <assaf at aikilinux.com> <assaf.flatto at livepopuli.com>
 <marius at graylog.com> <marius at torch.sh>
 <jason.young at velaspan.com> <jyoung15 at gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 4b79206..4fc0169 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -106,7 +106,7 @@ Stephan Platz <github at paalsteek.de>
 Stephan Tesch <stephan at tesch.cx>
 Steve McMaster <mcmaster at hurricanelabs.com>
 Thomas Gelf <thomas at gelf.net>
-Thomas Widhalm <thomas.widhalm at netways.de>
+Thomas Widhalm <thomas.widhalm at icinga.com>
 Tim Hardeck <thardeck at suse.de>
 Timo Buhrmester <van.fstd at gmail.com>
 Tobias Birnbaum <osterd at gmx.de>



More information about the icinga-checkins mailing list