follow the right branches

diff --git a/modules.list b/modules.list
index dce9d5f..d4277c3 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -3,7 +3,7 @@ BootManager
 BootstrapFS
 CoDemux
 Mom
-Monitor
+Monitor:2.0
 MyPLC
 NodeManager:0.8
 NodeUpdate
@@ -26,9 +26,11 @@ nodeconfig
 nozomi
 pf2slice
 pl_sshd
+planetlab-umts-tools
 pypcilib
 pyplnet
 util-vserver-pl
 util-vserver:scholz
-vsys:0.7
+vsys-scripts
+vsys:0.9
 www-register-wizard

diff --git a/onelab-tags.mk b/onelab-tags.mk
index bbb4223..a22e862 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -28,13 +28,13 @@ iproute2-SVNPATH            := http://svn.planet-lab.org/svn//iproute2/tags/iproute2-2.6.1
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn//inotify-tools/tags/inotify-tools-3.13-2
 vsys-SVNBRANCH                 := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn//vsys/tags/vsys-0.9-1
-vsys-scripts-SVNPATH                   := http://svn.planet-lab.org/svn//vsys-scripts/trunk
+vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn//vsys-scripts/trunk
 dummynet_image-SVNPATH          := http://svn.planet-lab.org/svn/dummynet_image/tags/dummynet_image-1.0-5
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-4
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-11
 PLEWWW-SVNPATH                  := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-2
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn//www-register-wizard/tags/www-register-wizard-4.2-2
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-2.0-9
+Monitor-SVNBRANCH              := 2.0
 nodeconfig-SVNPATH              := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn//BootManager/tags/BootManager-4.3-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn//pypcilib/tags/pypcilib-0.2-5

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index c2b0aa5..c7ec244 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -22,13 +22,14 @@ Mom-SVNPATH                 := http://svn.planet-lab.org/svn//Mom/tags/Mom-2.3-0
 iptables-SVNPATH               := http://svn.planet-lab.org/svn//iptables/tags/iptables-1.4.1.1-0
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn//iproute2/tags/iproute2-2.6.16-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn//inotify-tools/tags/inotify-tools-3.13-2
-vsys-scripts-SVNPATH                   := http://svn.planet-lab.org/svn/vsys-scripts/trunk
+vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/trunk
 vsys-SVNBRANCH                 := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-1
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn//PLCAPI/tags/PLCAPI-4.3-4
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-11
 PLEWWW-SVNPATH                  := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-2
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn//www-register-wizard/tags/www-register-wizard-4.2-2
+Monitor-SVNBRANCH              := 2.0
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-2.0-9
 nodeconfig-SVNPATH              := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-2
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn//BootManager/tags/BootManager-4.3-3