From: Yann Dupont <yann@objoo.org>
Date: Sun, 8 Nov 2015 17:40:20 +0000 (+0100)
Subject: mailmap: Jenkins affiliation
X-Git-Tag: v10.0.1~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6495%2Fhead;p=ceph.git

mailmap: Jenkins affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
---

diff --git a/.mailmap b/.mailmap
index f3326a22c4a4..2ae37df88b6d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -111,6 +111,8 @@ Jason Dillaman <dillaman@redhat.com> <jdillaman@redhat.com>
 Jean-Charles Lopez <jelopez@redhat.com> jeanchlopez <jelopez@redhat.com>
 Jeff Epstein <jepst79@gmail.com> <jepst79@gmail.com>
 Ji Chen <insomnia@139.com> <insomnia@139.com>
+Jenkins <jenkins@ceph.com> <jenkins-build@jenkins-slave-wheezy.localdomain>
+Jenkins <jenkins@ceph.com> Jenkins <jenkins@inktank.com>
 Jiang Heng <jiangheng0511@gmail.com> jiangheng <jiangheng0511@gmail.com>
 Jiantao He <hejiantao5@gmail.com> hejiantao5 <hejiantao5@gmail.com>
 Jian Wen <wenjian@letv.com> <wenjianhn@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index 4b57968f846e..3fa7eb37346f 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -245,6 +245,7 @@ Red Hat <contact@redhat.com> Ilya Dryomov <idryomov@redhat.com>
 Red Hat <contact@redhat.com> Ira Cooper <ira@samba.org>
 Red Hat <contact@redhat.com> Jason Dillaman <dillaman@redhat.com>
 Red Hat <contact@redhat.com> Jean-Charles Lopez <jelopez@redhat.com>
+Red Hat <contact@redhat.com> Jenkins <jenkins@ceph.com>
 Red Hat <contact@redhat.com> João Eduardo Luís <joao@redhat.com>
 Red Hat <contact@redhat.com> John Spray <jspray@redhat.com>
 Red Hat <contact@redhat.com> John Wilkins <jwilkins@redhat.com>
diff --git a/.peoplemap b/.peoplemap
index 8e43b9a8af1b..cfc67c6d02c6 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -21,6 +21,7 @@ Dan Mick <dmick@redhat.com> Dan Mick <dan.mick@inktank.com>
 David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
 Greg Farnum <gfarnum@redhat.com> Greg Farnum <greg@inktank.com>
 Ilya Dryomov <idryomov@redhat.com> Ilya Dryomov <ilya.dryomov@inktank.com>
+Jenkins <jenkins@ceph.com> Jenkins <jenkins@inktank.com>
 Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao.luis@inktank.com>
 Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao@redhat.com>
 John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>