From: Thierry Parmentelat Date: Tue, 8 Mar 2011 23:21:32 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc21~69 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=34f21d8526772de363ad22c8aabf7ce2ad91b361;hp=39ef6b74a75ec2b32964571d4114ef64e3fe323c;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index ddcb0fe4..6e7a5585 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -30,7 +30,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-1 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-1 vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-29 +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-61 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5