Merge branch 'master' into lxc_devel

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index fc6afff..3745c88 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -49,8 +49,8 @@ ejabberd-GITPATH                := git://git.onelab.eu/ejabberd.git@master
 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.planet-lab.org/bootmanager.git@lxcbuild
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 406b15c..98e21a4 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -46,7 +46,7 @@ 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-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@lxcbuild
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10