From: Thierry Parmentelat Date: Thu, 29 Nov 2012 05:40:04 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc33~24 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9ad86ca067e255264859206d75f109367dfa807e;hp=cca07de4a1c569dcf7dc6173b00137d94457ac4b;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/lxc-tags.mk b/lxc-tags.mk index 8fb43efb..aec6bd00 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -35,7 +35,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2 omf-GITPATH := git://git.planet-lab.org/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-17 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-19 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7 # this module still has changes that won't run on the mainstream distrib diff --git a/mlab-tags.mk b/mlab-tags.mk index 0ef27d65..21b419bb 100644 --- a/mlab-tags.mk +++ b/mlab-tags.mk @@ -44,7 +44,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-17 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-19 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-24 diff --git a/onelab-tags.mk b/onelab-tags.mk index e8c91f9a..4369d8d7 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -46,7 +46,7 @@ pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0 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.1-17 +sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.1-19 sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-7 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-24 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index f328cd8f..09f018e4 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -44,7 +44,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-17 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-19 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-24