3:23 p.m.
On 10/22/2012 11:01 AM, Osier Yang wrote:
On 2012年10月19日 07:20, Cole Robinson wrote:
> 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.
> ---
>
> I couldn't get the latter chunk of sed magic working... and since nothing
> really makes me reach my frustration limit faster than Makefiles and
> shell trickery, I just stuck with the basic changes.
>
> v3:
> Fix VPATH builds
> Use sort -u
> Sort AUTHORS.in
> Condense bootstrap.conf change
>
> .gitignore | 1 +
> .mailmap | 15 +++-
> AUTHORS | 279
> ---------------------------------------------------------
> AUTHORS.in | 90 +++++++++++++++++++
> Makefile.am | 12 ++-
> bootstrap.conf | 4 +-
> cfg.mk | 15 ----
> 7 files changed, 118 insertions(+), 298 deletions(-)
> delete mode 100644 AUTHORS
> create mode 100644 AUTHORS.in
>
> diff --git a/.gitignore b/.gitignore
> index c185cbc..804eda4 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -26,6 +26,7 @@
> .memdump
> .sc-start-sc_*
> /ABOUT-NLS
> +/AUTHORS
> /COPYING
> /ChangeLog
> /GNUmakefile
> diff --git a/.mailmap b/.mailmap
> index 98ff6dc..c430200 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -3,7 +3,6 @@
> # Email consolidation:
> #<Preferred address in AUTHORS> <other alias used by same author>
>
> -<amy.griffis(a)hp.com> <aron.griffis(a)hp.com>
> <bozzolan(a)gmail.com> <redshift(a)gmx.com>
> <charles_duffy(a)messageone.com> <charles(a)dyfis.net>
> <dfj(a)redhat.com> <dfj(a)dfj.bne.redhat.com>
> @@ -35,6 +34,8 @@
> <gerd(a)egidy.de> <gerd.von.egidy(a)intra2net.com>
> <benoar(a)dolka.fr> <benjamin.cama(a)telecom-bretagne.eu>
> <zhlcindy(a)linux.vnet.ibm.com> <zhlcindy(a)gmail.com>
> +<serge.hallyn(a)canonical.com> <serue(a)us.ibm.com>
> +<pritesh.kothari(a)sun.com> <Pritesh.Kothari(a)Sun.COM>
>
> # Name consolidation:
> # Preferred author spelling<preferred email>
> @@ -43,3 +44,15 @@ Royce Lv<lvroyce(a)linux.vnet.ibm.com>
> Daniel J Walsh<dwalsh(a)redhat.com>
> Ján Tomko<jtomko(a)redhat.com>
> Gerd von Egidy<gerd(a)egidy.de>
> +MATSUDA Daiki<matsudadik(a)intellilink.co.jp>
> +Tang Chen<tangchen(a)cn.fujitsu.com>
> +Peng Zhou<ailvpeng25(a)gmail.com>
> +Dirk Herrendoerfer<d.herrendoerfer(a)herrendoerfer.name>
> +Thibault VINCENT<thibault.vincent(a)smartjog.com>
> +Aurelien Rougemont<beorn(a)binaries.fr>
> +Serge E. Hallyn<serge.hallyn(a)canonical.com>
> +Henrik Persson E<henrik.e.persson(a)ericsson.com>
> +Philipp Hahn<hahn(a)univention.de>
> +Marco Bozzolan<bozzolan(a)gmail.com>
> +Marco Bozzolan<redshift(a)gmx.com>
> +Pritesh Kothari<pritesh.kothari(a)sun.com>
> diff --git a/AUTHORS b/AUTHORS
> deleted file mode 100644
> index 27c4eda..0000000
> --- a/AUTHORS
> +++ /dev/null
> @@ -1,279 +0,0 @@
> - libvirt Authors
> - ===============
> -
> -The libvirt project was initiated by:
> -
> - Daniel Veillard<veillard(a)redhat.com> or<daniel(a)veillard.com>
> -
> -The primary maintainers and people with commit access rights:
> -
> - Daniel Veillard<veillard(a)redhat.com>
> - Daniel Berrange<berrange(a)redhat.com>
> - Richard W.M. Jones<rjones(a)redhat.com>
> - Mark McLoughlin<markmc(a)redhat.com>
> - Anthony Liguori<aliguori(a)us.ibm.com>
> - Jim Meyering<meyering(a)redhat.com>
> - Jim Fehlig<jfehlig(a)suse.com>
> - Chris Lalancette<clalance(a)redhat.com>
> - Cole Robinson<crobinso(a)redhat.com>
> - Guido Günther<agx(a)sigxcpu.org>
> - John Levon<john.levon(a)sun.com>
> - Matthias Bolte<matthias.bolte(a)googlemail.com>
> - Jiří Denemark<jdenemar(a)redhat.com>
> - Dave Allan<dallan(a)redhat.com>
> - Laine Stump<laine(a)redhat.com>
> - Stefan Berger<stefanb(a)us.ibm.com>
> - Eric Blake<eblake(a)redhat.com>
> - Justin Clift<jclift(a)redhat.com>
> - Osier Yang<jyang(a)redhat.com>
> - Wen Congyang<wency(a)cn.fujitsu.com>
> - Michal Prívozník<mprivozn(a)redhat.com>
> - Peter Krempa<pkrempa(a)redhat.com>
> - Christophe Fergeau<cfergeau(a)redhat.com>
> - Alex Jia<ajia(a)redhat.com>
> - Martin Kletzander<mkletzan(a)redhat.com>
> -
> -Previous maintainers:
> - Karel Zak<kzak(a)redhat.com>
> - Atsushi SAKAI<sakaia(a)jp.fujitsu.com>
> - Dave Leskovec<dlesko(a)linux.vnet.ibm.com>
> - Dan Smith<danms(a)us.ibm.com>
> -
> -Patches have also been contributed by:
> -
> - David Lutterkort<dlutter(a)redhat.com>
> - Andrew Puch<apuch(a)redhat.com>
> - Philippe Berthault<philippe.berthault(a)Bull.net>
> - Hugh Brock<hbrock(a)redhat.com>
> - Michel Ponceau<michel.ponceau(a)bull.net>
> - Jeremy Katz<katzj(a)redhat.com>
> - Pete Vetere<pvetere(a)redhat.com>
> - Kazuki Mizushima<mizushima.kazuk(a)jp.fujitsu.com>
> - Saori Fukuta<fukuta.saori(a)jp.fujitsu.com>
> - Tatsuro Enokura<fj7716hz(a)aa.jp.fujitsu.com>
> - Takahashi Tomohiro<takatom(a)jp.fujitsu.com>
> - Nobuhiro Itou<fj0873gn(a)aa.jp.fujitsu.com>
> - Masayuki Sunou<fj1826dm(a)aa.jp.fujitsu.com>
> - Mark Johnson<johnson.nh(a)gmail.com>
> - Christian Ehrhardt<ehrhardt(a)linux.vnet.ibm.com>
> - Shuveb Hussain<shuveb(a)binarykarma.com>
> - Jim Paris<jim(a)jtan.com>
> - Daniel Hokka Zakrisson<daniel(a)hozac.com>
> - Mads Chr. Olesen<shiyee(a)shiyee.dk>
> - Anton Protopopov<aspsk2(a)gmail.com>
> - Stefan de Konink<dekonink(a)kinkrsoftware.nl>
> - Kaitlin Rupert<kaitlin(a)linux.vnet.ibm.com>
> - Evgeniy Sokolov<evg(a)openvz.org>
> - David Lively<dlively(a)virtualiron.com>
> - Charles Duffy<Charles_Duffy(a)messageone.com>
> - Nguyen Anh Quynh<aquynh(a)gmail.com>
> - James Morris<jmorris(a)namei.org>
> - Chris Wright<chrisw(a)redhat.com>
> - Ben Guthro<ben.guthro(a)gmail.com>
> - Shigeki Sakamoto<fj0588di(a)aa.jp.fujitsu.com>
> - Gerd von Egidy<gerd(a)egidy.de>
> - Itamar Heim<iheim(a)redhat.com>
> - Markus Armbruster<armbru(a)redhat.com>
> - Ryota Ozaki<ozaki.ryota(a)gmail.com>
> - Daniel J Walsh<dwalsh(a)redhat.com>
> - Maximilian Wilhelm<max(a)rfc2324.org>
> - Pritesh Kothari<Pritesh.Kothari(a)Sun.COM>
> - Amit Shah<amit.shah(a)redhat.com>
> - Florian Vichot<florian.vichot(a)diateam.net>
> - Serge E. Hallyn<serue(a)us.ibm.com>
> - Soren Hansen<soren(a)linux2go.dk>
> - Abel Míguez Rodríguez<amiguezr(a)pdi.ucm.es>
> - Doug Goldstein<cardoe(a)cardoe.com>
> - Javier Fontan<jfontan(a)gmail.com>
> - Federico Simoncelli<fsimonce(a)redhat.com>
> - Amy Griffis<amy.griffis(a)hp.com>
> - Henrik Persson E<henrik.e.persson(a)ericsson.com>
> - Satoru SATOH<satoru.satoh(a)gmail.com>
> - Paolo Bonzini<pbonzini(a)redhat.com>
> - Miloslav Trmač<mitr(a)redhat.com>
> - Jamie Strandboge<jamie(a)canonical.com>
> - Gerhard Stenzel<gerhard.stenzel(a)de.ibm.com>
> - Matthew Booth<mbooth(a)redhat.com>
> - Diego Elio Pettenò<flameeyes(a)gmail.com>
> - Adam Litke<agl(a)us.ibm.com>
> - Steve Yarmie<steve.yarmie(a)gmail.com>
> - Dan Kenigsberg<danken(a)redhat.com>
> - Yuji NISHIDA<nishidy(a)nict.go.jp>
> - Dustin Xiong<x_k_123(a)hotmail.com>
> - Rolf Eike Beer<eike(a)sf-mail.de>
> - Wolfgang Mauerer<wolfgang.mauerer(a)siemens.com>
> - Philipp Hahn<hahn(a)univention.de>
> - Ed Swierk<eswierk(a)aristanetworks.com>
> - Paolo Smiraglia<paolo.smiraglia(a)gmail.com>
> - Sharadha Prabhakar<sharadha.prabhakar(a)citrix.com>
> - Chris Wong<wongc-redhat(a)hoku.net>
> - Daniel Berteaud<daniel(a)firewall-services.com>
> - Dustin Kirkland<kirkland(a)canonical.com>
> - Luiz Capitulino<lcapitulino(a)redhat.com>
> - Ryan Harper<ryanh(a)us.ibm.com>
> - Spencer Shimko<sshimko(a)tresys.com>
> - Marco Bozzolan<bozzolan(a)gmail.com>
> - Alex Williamson<alex.williamson(a)redhat.com>
> - Ersek Laszlo<lacos(a)caesar.elte.hu>
> - Kenneth Nagin<NAGIN(a)il.ibm.com>
> - Klaus Ethgen<Klaus(a)Ethgen.de>
> - Bryan Kearney<bkearney(a)redhat.com>
> - Darry L. Pierce<dpierce(a)redhat.com>
> - David Jorm<dfj(a)redhat.com>
> - Eduardo Otubo<otubo(a)linux.vnet.ibm.com>
> - Garry Dolley<gdolley(a)arpnetworks.com>
> - Harshavardhana<harsha(a)gluster.com>
> - Jonas Eriksson<jonas.j.eriksson(a)ericsson.com>
> - Jun Koi<junkoi2004(a)gmail.com>
> - Olivier Fourdan<ofourdan(a)redhat.com>
> - Ron Yorston<rmy(a)tigress.co.uk>
> - Shahar Klein<shaharklein(a)yahoo.com>
> - Taizo ITO<taizo.ito(a)hde.co.jp>
> - Thomas Treutner<thomas(a)scripty.at>
> - Jean-Baptiste Rouault<jean-baptiste.rouault(a)diateam.net>
> - Марк Коренберг<socketpair(a)gmail.com>
> - Alan Pevec<apevec(a)redhat.com>
> - Aurelien Rougemont<beorn(a)binaries.fr>
> - Patrick Dignan<pat_dignan(a)dell.com>
> - Serge Hallyn<serge.hallyn(a)canonical.com>
> - Nikunj A. Dadhania<nikunj(a)linux.vnet.ibm.com>
> - Lai Jiangshan<laijs(a)cn.fujitsu.com>
> - Harsh Prateek Bora<harsh(a)linux.vnet.ibm.com>
> - John Morrissey<jwm(a)horde.net>
> - KAMEZAWA Hiroyuki<kamezawa.hiroyu(a)jp.fujitsu.com>
> - Hu Tao<hutao(a)cn.fujitsu.com>
> - Laurent Léonard<laurent(a)open-minds.org>
> - MORITA Kazutaka<morita.kazutaka(a)lab.ntt.co.jp>
> - Josh Durgin<josh.durgin(a)inktank.com>
> - Roopa Prabhu<roprabhu(a)cisco.com>
> - Paweł Krześniak<pawel.krzesniak(a)gmail.com>
> - Kay Schubert<kayegypt(a)web.de>
> - Marc-André Lureau<marcandre.lureau(a)redhat.com>
> - Juerg Haefliger<juerg.haefliger(a)hp.com>
> - Matthias Dahl<mdvirt(a)designassembly.de>
> - Niels de Vos<ndevos(a)redhat.com>
> - Davidlohr Bueso<dave(a)gnu.org>
> - Alon Levy<alevy(a)redhat.com>
> - Hero Phương<herophuong93(a)gmail.com>
> - Zdenek Styblik<stybla(a)turnovfree.net>
> - Gui Jianfeng<guijianfeng(a)cn.fujitsu.com>
> - Michal Novotny<minovotn(a)redhat.com>
> - Markus Groß<gross(a)univention.de>
> - Phil Petty<phpetty(a)cisco.com>
> - Taku Izumi<izumi.taku(a)jp.fujitsu.com>
> - Minoru Usui<usui(a)mxm.nes.nec.co.jp>
> - Tiziano Mueller<dev-zero(a)gentoo.org>
> - Thibault VINCENT<thibault.vincent(a)smartjog.com>
> - Naoya Horiguchi<n-horiguchi(a)ah.jp.nec.com>
> - Jesse Cook<code.crashenx(a)gmail.com>
> - Alexander Todorov<atodorov(a)otb.bg>
> - Richard Laager<rlaager(a)wiktel.com>
> - Mark Wu<dwu(a)redhat.com>
> - Yufang Zhang<yuzhang(a)redhat.com>
> - Supriya Kannery<supriyak(a)linux.vnet.ibm.com>
> - Dirk Herrendoerfer<d.herrendoerfer(a)herrendoerfer.name>
> - Taisuke Yamada<tai(a)rakugaki.org>
> - Heath Petersen<HeathPetersen(a)Kandre.com>
> - Neil Wilson<neil(a)aldur.co.uk>
> - Ohad Levy<ohadlevy(a)gmail.com>
> - Michael Chapman<mike(a)very.puzzling.org>
> - Daniel Gollub<gollub(a)b1-systems.de>
> - David S. Wang<dwang2(a)cisco.com>
> - Ruben Kerkhof<ruben(a)rubenkerkhof.com>
> - Scott Moser<smoser(a)ubuntu.com>
> - Guannan Ren<gren(a)redhat.com>
> - John Williams<john.williams(a)petalogix.com>
> - Michael Santos<michael.santos(a)gmail.com>
> - Oskari Saarenmaa<os(a)ohmu.fi>
> - Nan Zhang<nzhang(a)redhat.com>
> - Wieland Hoffmann<themineo(a)googlemail.com>
> - Douglas Schilling Landgraf<dougsland(a)redhat.com>
> - Tom Vijlbrief<tom.vijlbrief(a)xs4all.nl>
> - Shradha Shah<sshah(a)solarflare.com>
> - Steve Hodgson<shodgson(a)solarflare.com>
> - Xu He Jie<xuhj(a)linux.vnet.ibm.com>
> - Lei Li<lilei(a)linux.vnet.ibm.com>
> - Matthias Witte<witte(a)netzquadrat.de>
> - Tang Chen<tangchen(a)cn.fujitsu.com>
> - Dan Horák<dan(a)danny.cz>
> - Sage Weil<sage(a)newdream.net>
> - David L Stevens<dlstevens(a)us.ibm.com>
> - Tyler Coumbes<coumbes(a)gmail.com>
> - Royce Lv<lvroyce(a)linux.vnet.ibm.com>
> - Patrice LACHANCE<patlachance(a)gmail.com>
> - Eli Qiao<taget(a)linux.vnet.ibm.com>
> - Michael Wood<esiotrot(a)gmail.com>
> - Bharata B Rao<bharata(a)linux.vnet.ibm.com>
> - Srivatsa S. Bhat<srivatsa.bhat(a)linux.vnet.ibm.com>
> - Chang Liu<lingjiao.lc(a)taobao.com>
> - Lorin Hochstein<lorin(a)isi.edu>
> - Christian Franke<nobody(a)nowhere.ws>
> - Prerna Saxena<prerna(a)linux.vnet.ibm.com>
> - Michael Ellerman<michael(a)ellerman.id.au>
> - Rommer<rommer(a)active.by>
> - Yuri Chornoivan<yurchor(a)ukr.net>
> - Deepak C Shetty<deepakcs(a)linux.vnet.ibm.com>
> - Laszlo Ersek<lersek(a)redhat.com>
> - Zeeshan Ali (Khattak)<zeeshanak(a)gnome.org>
> - Marcelo Cerri<mhcerri(a)linux.vnet.ibm.com>
> - Hendrik Schwartke<hendrik(a)os-t.de>
> - Ansis Atteka<aatteka(a)nicira.com>
> - Dan Wendlandt<dan(a)nicira.com>
> - Kyle Mestery<kmestery(a)cisco.com>
> - Lincoln Myers<lincoln_myers(a)yahoo.com>
> - Peter Robinson<pbrobinson(a)gmail.com>
> - Benjamin Cama<benoar(a)dolka.fr>
> - Duncan Rance<libvirt(a)dunquino.com>
> - Peng Zhou<ailvpeng25(a)gmail.com>
> - Li Zhang<zhlcindy(a)linux.vnet.ibm.com>
> - Stef Walter<stefw(a)gnome.org>
> - Christian Benvenuti<benve(a)cisco.com>
> - Ilja Livenson<ilja.livenson(a)gmail.com>
> - Stefan Bader<stefan.bader(a)canonical.com>
> - MATSUDA Daiki<matsudadik(a)intellilink.co.jp>
> - Jan Kiszka<jan.kiszka(a)siemens.com>
> - Ryan Woodsmall<rwoodsmall(a)gmail.com>
> - Wido den Hollander<wido(a)widodh.nl>
> - Eugen Feller<eugen.feller(a)inria.fr>
> - Dmitry Guryanov<dguryanov(a)parallels.com>
> - William Jon McCann<william.jon.mccann(a)gmail.com>
> - David Weber<wb(a)munzinger.de>
> - Marti Raudsepp<marti(a)juffo.org>
> - Radu Caragea<dmns_serp(a)yahoo.com>
> - Beat Jörg<Beat.Joerg(a)ssatr.ch>
> - Gao feng<gaofeng(a)cn.fujitsu.com>
> - Dipankar Sarma<dipankar(a)in.ibm.com>
> - Gerd Hoffmann<kraxel(a)redhat.com>
> - Viktor Mihajlovski<mihajlov(a)linux.vnet.ibm.com>
> - Thang Pham<thang.pham(a)us.ibm.com>
> - Eiichi Tsukata<eiichi.tsukata.xh(a)hitachi.com>
> - Sascha Peilicke<saschpe(a)suse.de>
> - Chuck Short<chuck.short(a)canonical.com>
> - Sebastian Wiedenroth<wiedi(a)frubar.net>
> - Ata E Husain Bohra<ata.husain(a)hotmail.com>
> - Ján Tomko<jtomko(a)redhat.com>
> - Richa Marwaha<rmarwah(a)linux.vnet.ibm.com>
> - Peter Feiner<peter(a)gridcentric.ca>
> - Frido Roose<frido.roose(a)gmail.com>
> - Asad Saeed<asad.saeed(a)acidseed.com>
> - Sukadev Bhattiprolu<sukadev(a)linux.vnet.ibm.com>
> - Thomas Woerner<twoerner(a)redhat.com>
> - J.B. Joret<jb(a)linux.vnet.ibm.com>
> - Stefan Hajnoczi<stefanha(a)linux.vnet.ibm.com>
> - Gene Czarcinski<gene(a)czarc.net>
> - Nishank Trivedi<nistrive(a)cisco.com>
> - Jasper Lievisse Adriaanse<jasper(a)humppa.nl>
> - Paul Eggert<eggert(a)cs.ucla.edu>
> - Dwight Engen<dwight.engen(a)oracle.com>
> - liguang<lig.fnst(a)cn.fujitsu.com>
> - Chuck Short<zulcss(a)gmail.com>
> - Alexander Larsson<alexl(a)redhat.com>
> -
> - [....send patches to get your name here....]
> -
> -The libvirt Logo was designed by Diana Fong
> -
> --- End
> -;; Local Variables:
> -;; coding: utf-8
> -;; End:
> diff --git a/AUTHORS.in b/AUTHORS.in
> new file mode 100644
> index 0000000..01339f2
> --- /dev/null
> +++ b/AUTHORS.in
> @@ -0,0 +1,90 @@
> + libvirt Authors
> + ===============
> +
> +The libvirt project was initiated by:
> +
> +Daniel Veillard<veillard(a)redhat.com> or<daniel(a)veillard.com>
> +
> +The primary maintainers and people with commit access rights:
> +
> +Alex Jia<ajia(a)redhat.com>
> +Martin Kletzander<mkletzan(a)redhat.com>
> +Alex Jia<ajia(a)redhat.com>
Found this when checking AUTHORS. Is it intended? I mean the
duplicate lines for "Alex" above.
Indeed, good catch. Martin was also duplicated, so I pushed a trivial patch
fixing it:
commit 2e99fa0385eea0084c520b4a3798a8663fb11b7a
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Mon Oct 22 16:19:38 2012 -0400
Remove a couple duplicates from AUTHORS.in
diff --git a/AUTHORS.in b/AUTHORS.in
index 01339f2..ebbc23e 100644
--- a/AUTHORS.in
+++ b/AUTHORS.in
@@ -8,8 +8,6 @@ Daniel Veillard <veillard(a)redhat.com> or
<daniel(a)veillard.com>
The primary maintainers and people with commit access rights:
Alex Jia <ajia(a)redhat.com>
-Martin Kletzander <mkletzan(a)redhat.com>
-Alex Jia <ajia(a)redhat.com>
Anthony Liguori <aliguori(a)us.ibm.com>
Chris Lalancette <clalance(a)redhat.com>
Christophe Fergeau <cfergeau(a)redhat.com>
Thanks,
Cole