From: Thierry Parmentelat Date: Thu, 8 May 2014 11:32:38 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.3.6~45 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3937b8727b761ae0914c2bb5a90fac626f82a975;hp=1cd799d8b7105857d65ff7b924a2ec5eeefd29d2;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/lxc-tags.mk b/lxc-tags.mk index 0481edc5..82421748 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -49,6 +49,6 @@ myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.3- # sfa-BRANCH := geni-v3 -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-3 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-4 # tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.3-4 diff --git a/mlab-tags.mk b/mlab-tags.mk index f2333ff7..a0294b6c 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-3 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-3 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-4 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-4 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-4 diff --git a/nornet-tags.mk b/nornet-tags.mk index 24cc246c..68f08673 100644 --- a/nornet-tags.mk +++ b/nornet-tags.mk @@ -80,6 +80,6 @@ myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.3- # sfa-BRANCH := geni-v3 -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-3 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-4 # tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.3-4 diff --git a/onelab-tags.mk b/onelab-tags.mk index b1069aeb..f70873e8 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -52,7 +52,7 @@ DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRate # sfa-BRANCH := geni-v3 -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-3 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-4 # # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.3-4 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index d2cd3e24..935c3553 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -42,7 +42,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-3 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-4 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-4 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-4