summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2012-10-12 19:50:19 -0400
committerCole Robinson <crobinso@redhat.com>2012-10-19 12:44:56 -0400
commit7b21981cdb4f5d6c492edb2face8a8159dcc212e (patch)
tree313e6495399f9556336848c921103ba149499bd9 /.mailmap
parent4492ef7f485a7d42d84a714d2150e648b11e2740 (diff)
downloadlibvirt-7b21981cdb4f5d6c492edb2face8a8159dcc212e.tar.gz
Autogenerate AUTHORS
AUTHORS.in tracks the maintainers, as well as some folks who were previously in AUTHORS but don't have a git commit with proper attribution. Generated output is sorted alphabetically and lacks pretty spacing, so tweak AUTHORS.in to follow the same format. Additionally, drop the syntax-check rule that previously validated AUTHORS against git log.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap15
1 files changed, 14 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 98ff6dc8d6..c430200ebe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,7 +3,6 @@
# Email consolidation:
# <Preferred address in AUTHORS> <other alias used by same author>
-<amy.griffis@hp.com> <aron.griffis@hp.com>
<bozzolan@gmail.com> <redshift@gmx.com>
<charles_duffy@messageone.com> <charles@dyfis.net>
<dfj@redhat.com> <dfj@dfj.bne.redhat.com>
@@ -35,6 +34,8 @@
<gerd@egidy.de> <gerd.von.egidy@intra2net.com>
<benoar@dolka.fr> <benjamin.cama@telecom-bretagne.eu>
<zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com>
+<serge.hallyn@canonical.com> <serue@us.ibm.com>
+<pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM>
# Name consolidation:
# Preferred author spelling <preferred email>
@@ -43,3 +44,15 @@ Royce Lv <lvroyce@linux.vnet.ibm.com>
Daniel J Walsh <dwalsh@redhat.com>
Ján Tomko <jtomko@redhat.com>
Gerd von Egidy <gerd@egidy.de>
+MATSUDA Daiki <matsudadik@intellilink.co.jp>
+Tang Chen <tangchen@cn.fujitsu.com>
+Peng Zhou <ailvpeng25@gmail.com>
+Dirk Herrendoerfer <d.herrendoerfer@herrendoerfer.name>
+Thibault VINCENT <thibault.vincent@smartjog.com>
+Aurelien Rougemont <beorn@binaries.fr>
+Serge E. Hallyn <serge.hallyn@canonical.com>
+Henrik Persson E <henrik.e.persson@ericsson.com>
+Philipp Hahn <hahn@univention.de>
+Marco Bozzolan <bozzolan@gmail.com>
+Marco Bozzolan <redshift@gmx.com>
+Pritesh Kothari <pritesh.kothari@sun.com>