Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 17:00:25 +0000 (12:00 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 17:00:25 +0000 (12:00 -0500)
onelab-k27-tags.mk
planetbridge-tags.mk
planetlab-k27-tags.mk
planetlab-k32-tags.mk
planetlab-tags.mk
trellis-tags.mk

index b1f1b88..2473e89 100644 (file)
@@ -32,7 +32,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys.git@vsys-0.9-5
 vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-19
 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-54
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-55
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-8
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -52,11 +52,11 @@ pyplnet-GITPATH                     := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-6
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-5
 vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@VserverReference-5.0-3
 bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
-myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-11
+myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-12
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-19
+tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-20
 
 ### temporary
 # nozomi not needed anymore for 2.6.27
index 02c976b..640ccd2 100644 (file)
@@ -26,7 +26,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys@vsys-0.9-4
 vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-54
+PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-55
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-4
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-4/
index 69a9ecb..da29612 100644 (file)
@@ -28,7 +28,7 @@ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.9-5
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-19
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-54
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-55
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
@@ -48,6 +48,6 @@ bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@boot
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
 vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
-myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-11
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-19
+tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-20
index 7923296..1e84e8e 100644 (file)
@@ -27,7 +27,7 @@ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.9-5
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-19
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-54
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-55
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-8
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -46,8 +46,8 @@ pyplnet-GITPATH                       := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
 vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
-myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-11
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-19
+tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-20
index 94c10b1..0ea5435 100644 (file)
@@ -28,7 +28,7 @@ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.9-5
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-19
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-54
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-55
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-8
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -47,8 +47,8 @@ pyplnet-GITPATH                       := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
 vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
-myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-11
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
 DistributedRateLimiting-SVNPATH                        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-19
+tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-20
index 5a9c9f5..aa828f2 100644 (file)
@@ -31,7 +31,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys@vsys-0.9-4
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-24
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-54
+PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-55
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-4/