use plcapi and myplc from master as they both depend on one another

diff --git a/lxc-tags.mk b/lxc-tags.mk
index cf0bb67..f038580 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -41,7 +41,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
 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
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@master
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.planet-lab.org/tests.git@master
 libvirt-GITPATH                 := git://git.planet-lab.org/libvirt.git@lxcbuild

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index b3b5ad9..b37685c 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -35,7 +35,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-2
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-36
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi.git@plcapi-5.0-37
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi.git@master
 drupal-GITPATH                  := git://git.onelab.eu/drupal.git@drupal-4.7-15
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-70
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -58,7 +58,7 @@ pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-1
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@master
 vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
 bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-14
-myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-19
+myplc-GITPATH                   := git://git.onelab.eu/myplc.git@master
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath