From: Marco Yuen Date: Wed, 14 Dec 2011 17:13:36 +0000 (-0500) Subject: Merge branch 'master' into lxc X-Git-Tag: lxcdevel~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=76f404f997d5686dd505459f02e48454165103ff;p=build.git Merge branch 'master' into lxc Conflicts: onelab-k32-tags.mk planetlab-k32-tags.mk --- 76f404f997d5686dd505459f02e48454165103ff diff --cc onelab-k32-tags.mk index eb75cb19,6c3e90ba..61f15cdc --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@@ -49,10 -49,10 +49,10 @@@ 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-2.0-2 - sface-GITPATH := git://git.onelab.eu/sface.git@master + sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.0-4 + 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 6d969b8d,39aa07b1..66eab4e4 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@@ -44,10 -44,10 +44,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-2 - sface-GITPATH := git://git.planet-lab.org/sface.git@master + sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-4 + 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