diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
| commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
| tree | e6707df68f72baa8645210ba931272285116ad85 /.mailmap | |
| parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
| parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) | |
Merge branch 'upstream'
Conflicts:
glusterfs.spec.in
xlators/mgmt/glusterd/src/Makefile.am
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd.h
Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,5 +1,7 @@ # .mailmap, see 'git short-log --help' for details # +# This file needs to match extras/who-wrote-glusterfs/gitdm.aliases. +# # Listing of contributors that filed patches with different email addresses. # Format: <name> <main-email> <alias> [<alias> ...] # @@ -9,6 +11,7 @@ Anand Avati <avati@redhat.com> <avati@gluster.com> <avati@dev.gluster.com> <avat Anush Shetty <ashetty@redhat.com> <anush@gluster.com> Csaba Henk <csaba@redhat.com> <csaba@gluster.com> <csaba@lowlife.hu> <csaba@zresearch.com> Harshavardhana <fharshav@redhat.com> <harsha@gluster.com> <harsha@zresearch.com> <harsha@dev.gluster.com> <harsha@harshavardhana.net> +Justin Clift <justin@gluster.org> <jclift@redhat.com> Kaleb S. KEITHLEY <kkeithle@redhat.com> <kkeithle@f16node1.kkeithle.usersys.redhat.com> Kaushal M <kaushal@redhat.com> <kaushal@gluster.com> Kaushik BV <kbudiger@redhat.com> <kaushikbv@gluster.com> @@ -19,6 +22,7 @@ M S Vishwanath Bhat <vbhat@redhat.com> <msvbhat@gmail.com> <vishwanath@gluster.c Pavan Sondur <pavan@gluster.com> <pavan@dev.gluster.com> Pete Zaitcev <zaitcev@kotori.zaitcev.us> <zaitcev@yahoo.com> Pranith Kumar K <pkarampu@redhat.com> <pranithk@gluster.com> +Prashanth Pai <ppai@redhat.com> <nullpai@gmail.com> Raghavendra Bhat <raghavendra@redhat.com> <raghavendrabhat@gluster.com> Raghavendra G <rgowdapp@redhat.com> <raghavendra@gluster.com> <raghavendra@zresearch.com> Rahul C S <rahulcs@redhat.com> <rahulcssjce@gmail.com> |