From: Marco Yuen <marcoy@gmail.com>
Date: Wed, 25 Jan 2012 18:01:39 +0000 (-0500)
Subject: Merge branch 'master' into lxc_devel
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cdbffe71f180f16dfe32b961e99f02a624ec0705;p=build.git

Merge branch 'master' into lxc_devel
---

cdbffe71f180f16dfe32b961e99f02a624ec0705
diff --cc onelab-k32-tags.mk
index fc6affff,7ab8a861..3745c880
--- 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-9
- sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-3
+ sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-10
+ sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-4
  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 406b15c3,bbdffaaa..98e21a43
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -46,9 -45,9 +46,9 @@@ ejabberd-GITPATH		:= git://git.planet-l
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
  ###
  sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-7
- sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-3
+ sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-4
  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