From: Thierry Parmentelat Date: Tue, 4 Oct 2011 06:59:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: lxcbuild~62 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=adeab347f6a4908d09ac919c12cbc1a80d83dd6d;hp=-c;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- adeab347f6a4908d09ac919c12cbc1a80d83dd6d diff --combined onelab-k27-tags.mk index ce051dfb,7a1b35e4..9d93ddb2 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@@ -24,7 -24,7 +24,7 @@@ Mom-SVNPATH := http://svn.planet-lab. inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2 - vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-31 + vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-32 plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-35 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-67 @@@ -40,8 -40,8 +40,8 @@@ omf-GITPATH := git: oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-1.0-36 -sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-19 +sfa-GITPATH := git://git.onelab.eu/sfa.git@master +sface-GITPATH := git://git.onelab.eu/sface.git@master nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10 diff --combined onelab-k32-tags.mk index deed1273,30634e60..d50575a1 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@@ -34,7 -34,7 +34,7 @@@ Mom-SVNPATH := http://svn.planet-lab. inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2 - vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-31 + vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-32 plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-35 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-67 @@@ -49,8 -49,8 +49,8 @@@ ejabberd-GITPATH := git://git.onelab.e omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-1.0-36 -sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-19 +sfa-GITPATH := git://git.onelab.eu/sfa.git@master +sface-GITPATH := git://git.onelab.eu/sface.git@master nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10