From f7e19ce46782fd62c50894ed541cebdcf72ead82 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Tue, 15 Apr 2014 11:24:31 +0200
Subject: scripts: add new email aliases

Two developers started to use new email addresses, marking them as
aliases. Also assign @gmail.com addresses to the "(unknown)" employer.

Change-Id: Ic5722c1611b003182c0288ba530d6ab275c2ca1b
BUG: 1087771
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/7484
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Tested-by: Vijay Bellur <vbellur@redhat.com>
---
 .mailmap                                    | 4 ++++
 extras/who-wrote-glusterfs/gitdm.aliases    | 2 ++
 extras/who-wrote-glusterfs/gitdm.domain-map | 1 +
 3 files changed, 7 insertions(+)

diff --git a/.mailmap b/.mailmap
index 6bcd95dea..d4a13b400 100644
--- a/.mailmap
+++ b/.mailmap
@@ -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>
diff --git a/extras/who-wrote-glusterfs/gitdm.aliases b/extras/who-wrote-glusterfs/gitdm.aliases
index 784a3e3bc..e19b99c79 100644
--- a/extras/who-wrote-glusterfs/gitdm.aliases
+++ b/extras/who-wrote-glusterfs/gitdm.aliases
@@ -20,6 +20,7 @@ harsha@gluster.com	fharshav@redhat.com
 harsha@zresearch.com	fharshav@redhat.com
 harsha@dev.gluster.com	fharshav@redhat.com
 harsha@harshavardhana.net	fharshav@redhat.com
+jclift@redhat.com       jclift@gluster.org
 kkeithle@f16node1.kkeithle.usersys.redhat.com	kkeithle@redhat.com
 kaushal@gluster.com	kaushal@redhat.com
 kaushikbv@gluster.com	kbudiger@redhat.com
@@ -29,6 +30,7 @@ krishna@guest-laptop	ksriniva@redhat.com
 kp@gluster.com	kparthas@redhat.com
 me@louiszuckerman.com	louiszuckerman@gmail.com
 msvbhat@gmail.com	vbhat@redhat.com
+nullpai@gmail.com       ppai@redhat.com
 vishwanath@gluster.com	vbhat@redhat.com
 pavan@dev.gluster.com	pavan@gluster.com
 zaitcev@yahoo.com	zaitcev@kotori.zaitcev.us
diff --git a/extras/who-wrote-glusterfs/gitdm.domain-map b/extras/who-wrote-glusterfs/gitdm.domain-map
index f1c305898..39526f0f9 100644
--- a/extras/who-wrote-glusterfs/gitdm.domain-map
+++ b/extras/who-wrote-glusterfs/gitdm.domain-map
@@ -4,6 +4,7 @@
 active.by       ActiveCloud
 cern.ch         CERN
 gluster.com     Red Hat
+gmail.com       (unknown)
 gooddata.com	GoodData
 hastexo.com     hastexo
 ibm.com		IBM
-- 
cgit