From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Wed, 7 Jul 2010 15:13:26 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/infrastructure
X-Git-Tag: foo~82^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=73da86f08bfb4c018829f8652f98e08b8a69da93;hp=fff70f86e2353e461d70d84e0b915003dad64c6a;p=infrastructure.git

Merge branch 'master' of git.onelab.eu:/git/infrastructure
---

diff --git a/scripts/git-AUTHORS b/scripts/git-AUTHORS
new file mode 100644
index 0000000..b1d4fad
--- /dev/null
+++ b/scripts/git-AUTHORS
@@ -0,0 +1,52 @@
+root = root <root@planet-lab.org>
+deisenst = David E. Eisenstat <deisenst@cs.princeton.edu>
+acb = Andy Bavier <acb@cs.princeton.edu>
+alk = Aaron Klingaman <alk@cs.princeton.edu>
+alk-pl_rpm = Aaron Klingaman <alk@cs.princeton.edu>
+alk-alpina = Aaron Klingaman <alk@cs.princeton.edu>
+anil = Anil-Kumar Vengalil <Anil-Kumar.Vengalil@sophia.inria.fr>
+bakers = Scott Baker <bakers@cs.arizona.edu>
+baris = Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
+Baris Metin = Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
+Baris = Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
+caglar = S.Çağlar Onur <caglar@cs.princeton.edu>
+carrano = Ricardo Carrano <carrano@laptop.org>
+ckong = Colin Kong <ckong@cs.princeton.edu>
+dhozac = Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
+ejaffe = Elliot Jaffe <elliot.jaffe@mail.huji.ac.il>
+faiyaza = Faiyaz Ahmed <faiyaza@cs.princeton.edu>
+feamster = Nick Feamster <feamster@cc.gatech.edu>
+giovanni = Giovanni Gherdovich <Giovanni.Gherdovich@sophia.inria.fr>
+guthemberg = Guthemberg Silvestre <guthemberg.silvestre@lip6.fr>
+herbert = Herbert Pötzl <herbert@13thfloor.at>
+jduarte = Jairo Lino Duarte <jduarte@ic.uff.br>
+jkarlin = Josh Karlin <jkarlin@bbn.com>
+jrex = Jennifer Rexford <jrex@cs.princeton.edu>
+kcwebb = Kevin Webb <kcwebb@ucsd.edu>
+kyoungso = KyoungSoo Park <kyoungso@cs.princeton.edu>
+llp = Larry Peterson <llp@cs.princeton.edu>
+lniccolini = Luca Niccolini <luca.niccolini@quantavis.com>
+marta = Marta Carbone <marta@prova.iet.unipi.it>
+martinm = Martin Makowiecki <martinm@cs.princeton.edu>
+mef = Marc Fiuczynski <mef@cs.princeton.edu>
+mff = Mary Fernández <mff@research.att.com>
+mhw = Michael Wawrzoniak <mhw@cs.princeton.edu>
+mlhuang = Mark Huang <mlhuang@cs.princeton.edu>
+mlh-pl_rpm = Mark Huang <mlhuang@cs.princeton.edu>
+msun = Mike Sun <msun@gatech.edu>
+nakao = Akihiro Nakao <nakao@iii.u-tokyo.ac.jp>
+rizzo = Luigi Rizzo <rizzo@iet.unipi.it>
+rmoran = Reed Moran <rmoran@cs.princeton.edu>
+sapanb = Sapan Bhatia <sapanb@cs.princeton.edu>
+scott = Scott Karlin <scott@cs.princeton.edu>
+smuir = Steve Muir <smuir@cs.princeton.edu>
+soltesz = Stephen Soltesz <soltesz@cs.princeton.edu>
+ssevinc = Soner Sevinc <ssevinc@cs.princeton.edu>
+thierry = Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
+Thierry Parmentelat = Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
+tmack = Tony Mack <tmack@cs.princeton.edu>
+tmitchell = Tom Mitchell <tmitchel@bbn.com>
+valas = Vytautas Valancius <valas@gatech.edu>
+xcuvellier = Xavier Cuvellier <Xavier.Cuvellier@lip6.fr>
+mchaoui = mchaoui
+(no author) = Planet-Lab Support <support@planet-lab.org>
\ No newline at end of file
diff --git a/scripts/git-clone-svn.sh b/scripts/git-clone-svn.sh
index bdd86f6..d58f86e 100755
--- a/scripts/git-clone-svn.sh
+++ b/scripts/git-clone-svn.sh
@@ -9,6 +9,8 @@
 # so run locally at princeton
 SVNROOT="file:///svn"
 
+AUTHORS=$(dirname $0)/git-AUTHORS
+
 function clone () {
     for arg in "$@" ; do
 	SVN_MODULE=$(basename $arg)
@@ -23,6 +25,7 @@ function clone () {
 	mkdir -p $GIT_WORKDIR
 	pushd $GIT_WORKDIR
 	svn2git $SVN_PATH
+        svn2git $SVN_PATH --authors $AUTHORS
 	popd
 
         mv ${GIT_WORKDIR}/.git ${GIT_REPO}