From: Thierry Parmentelat Date: Fri, 24 Sep 2010 14:38:38 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc16~72 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=10535d31e9c00c6ee8bc744602cd821da097fa9b;hp=-c;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- 10535d31e9c00c6ee8bc744602cd821da097fa9b diff --combined onelab-k27-tags.mk index cdd2041e,f1d11f26..12dde88b --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@@ -1,7 -1,7 +1,7 @@@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication ### - linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-26 + linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-27 madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-0 iptables-BUILD-FROM-SRPM := yes # tmp @@@ -44,7 -44,6 +44,7 @@@ ejabberd-GITPATH := git://git.onelab.e omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-8 ### sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-0.9-19 +sface-GITPATH := git://git.onelab.eu/sface.git@master nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9