From: Marco Yuen Date: Thu, 22 Dec 2011 15:46:14 +0000 (-0500) Subject: Merge branch 'master' into lxc_devel X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=27eb8a7156718285a99598b40d84c016e1f13dee;p=build.git Merge branch 'master' into lxc_devel Conflicts: planetlab-k32-tags.mk --- 27eb8a7156718285a99598b40d84c016e1f13dee diff --cc onelab-k32-tags.mk index 61f15cdc,ddba3936..81dc8b70 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@@ -49,10 -49,10 +49,10 @@@ ejabberd-GITPATH := git: 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-2.0-4 + sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.0-6 sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.9-0 nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 -bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxcbuild pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11 bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-11 diff --cc planetlab-k32-tags.mk index 753d2dad,e3b02489..747c1e12 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@@ -45,10 -44,10 +45,10 @@@ pyaspects-GITPATH := git://git.planet- ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### - sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-4 + sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-6 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-0 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5 -bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxcbuild pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10 pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11 DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1