From 817baf0e8340ae893ed129e0aab8503e0b7a2d92 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 7 Mar 2013 08:45:19 +0100 Subject: [PATCH] Setting tag myplc-5.2-1 supports httpd config for either mod_python (preferred) or mod_wsgi requires mod_wsgi on f18 only, otherwise mod_python supports httpd config for apache 2.4 (f18) new config variable PLC_FLAVOUR_VIRT_MAP to set 'virt' from fcdistro --- lxc-tags.mk | 2 +- mlab-tags.mk | 2 +- onelab-tags.mk | 2 +- planetlab-k32-tags.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lxc-tags.mk b/lxc-tags.mk index 5564c216..9612f97e 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -43,6 +43,6 @@ pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcuco bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-1 sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-3 nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master -myplc-GITPATH := git://git.planet-lab.org/myplc.git@master +myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.2-1 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@master diff --git a/mlab-tags.mk b/mlab-tags.mk index 0ef42775..63f5a202 100644 --- a/mlab-tags.mk +++ b/mlab-tags.mk @@ -58,6 +58,6 @@ pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcuco bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-1 sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-3 nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-2.1-4 -myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.1-6 +myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.2-1 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.1-10 diff --git a/onelab-tags.mk b/onelab-tags.mk index da187157..0b4e86d8 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -55,7 +55,7 @@ pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-1 bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.2-1 sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-3 nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@master -myplc-GITPATH := git://git.onelab.eu/myplc.git@master +myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.2-1 DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 # locating the right test directory - see make tests_gitpath diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 2f010d06..d6765eff 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -55,6 +55,6 @@ pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcuco bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-1 sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@master nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master -myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.1-6 +myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.2-1 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.1-10 -- 2.43.0