From: Thierry Parmentelat Date: Tue, 4 Oct 2011 06:59:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: lxcbuild~62 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=adeab347f6a4908d09ac919c12cbc1a80d83dd6d;hp=156620c13b5786863765a0b497cc40765491546d;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 7a1b35e4..9d93ddb2 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -40,8 +40,8 @@ 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-1.0-36 -sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-19 +sfa-GITPATH := git://git.onelab.eu/sfa.git@master +sface-GITPATH := git://git.onelab.eu/sface.git@master nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10 diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 30634e60..d50575a1 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -49,8 +49,8 @@ ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2 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-1.0-36 -sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-19 +sfa-GITPATH := git://git.onelab.eu/sfa.git@master +sface-GITPATH := git://git.onelab.eu/sface.git@master nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10