From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 6 Jun 2019 14:09:31 +0000 (+0200)
Subject: mailmap: Remove some duplicates
X-Git-Tag: v5.5.0-rc1~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6edbc148ed05b9751a0162b6e27b791e327ee44;p=thirdparty%2Flibvirt.git

mailmap: Remove some duplicates

Fabiano Fidencio was working for Red Hat when he contributed to
libvirt, Shi Lei's non-company email address contains the company
name so it's fair to assume contributions using it were made on
company time, and Adrian Brzezinski's personal email was used
for the S-o-b while the git authorship information clearly pointed
at the company being involved.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 311a10a8e9..2b080568bc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,10 @@
 <nshirokovskiy@virtuozzo.com> <nshirokovskiy@parallels.com>
 <jyang@redhat.com> <osier@yunify.com>
 <kkoukiou@redhat.com> <k.koukiou@googlemail.com>
+<intrigeri@boum.org> <intrigeri+libvirt@boum.org>
+<fidencio@redhat.com> <fabiano@fidencio.org>
+<shi_lei@massclouds.com> <shilei.massclouds@gmx.com>
+<adrian.brzezinski@eo.pl> <redhat@adrb.pl>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>