From: Thierry Parmentelat Date: Thu, 16 Feb 2012 11:52:17 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc27~119 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c8778f267d432d87fb1a76a09ca00798e750dd2d;hp=fd1b5faa5199598eaa153514fe22b043e714db32;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/lxc-tags.mk b/lxc-tags.mk index 31eeb388..21395314 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -40,7 +40,7 @@ pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet- DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-12 bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-11 -bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@master +bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-14 myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-19 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@master diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 8a7e381a..3d21c0ff 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -57,7 +57,7 @@ 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 vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@master +bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-14 myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-19 DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 3f173f19..98320eaf 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -45,7 +45,7 @@ pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcuco bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@master bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-11 vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-13 +bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-14 myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-19 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-36 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 98308061..3ef3c336 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -54,7 +54,7 @@ DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRate pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-12 bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-11 vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@master +bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-14 myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-19 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-36