From: Thierry Parmentelat Date: Sat, 26 Jun 2010 06:14:10 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc12~63 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1cff66a22a69b2a5d2c9185416f47745006ca3fd;hp=1337117f860a49d60ce313882d7d075bacfc2e1c;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 aac13bff..b4b3f891 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -19,7 +19,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-13 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-12 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 @@ -29,7 +29,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-BRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/trunk +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-11 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 diff --git a/onelab-tags.mk b/onelab-tags.mk index db9f5a9f..21c21f41 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -20,7 +20,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-12 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 @@ -30,7 +30,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-BRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/trunk +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-11 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 270fadb8..0e56bb0c 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -26,7 +26,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-BRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-10 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-11 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index da277566..693eb0b2 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -25,7 +25,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-BRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-10 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-11 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 7866f238..3f00d31d 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -24,7 +24,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-BRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-10 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-11 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3