git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 49a73e6 4b34b4a)
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)
1  2 
onelab-k27-tags.mk patch | diff1 | diff2 | blob | history
planetlab-k27-tags.mk patch | diff1 | diff2 | blob | history
planetlab-k32-tags.mk patch | diff1 | diff2 | blob | history
planetlab-tags.mk patch | diff1 | diff2 | blob | history

diff --combined onelab-k27-tags.mk
index b1f1b88,45be78f..2473e89
--- 1/onelab-k27-tags.mk
--- 2/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@@ -20,7 -20,7 +20,7 @@@ libnl-SVNPATH                 := http://svn.planet-la
  util-vserver-pl-GITPATH               := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-20
  nodeupdate-GITPATH            := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-23
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
  codemux-GITPATH                       := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
  fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@@ -32,7 -32,7 +32,7 @@@ vsys-GITPATH                  := git://git.onelab.eu/v
  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 +52,11 @@@ pyplnet-GITPATH                    := git://git.onelab.e
  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
diff --combined planetlab-k27-tags.mk
index 69a9ecb,e76a7cd..da29612
--- 1/planetlab-k27-tags.mk
--- 2/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@@ -12,7 -12,7 +12,7 @@@ libnl-SVNPATH                 := http://svn.planet-la
  util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-20
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
  # Trellis-specific NodeManager plugins
  NodeManager-topo-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
  NodeManager-optin-SVNPATH     := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@@ -28,7 -28,7 +28,7 @@@ vsys-GITPATH                  := git://git.planet-lab.
  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 +48,6 @@@ bootmanager-GITPATH             := git:
  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
diff --combined planetlab-k32-tags.mk
index 7923296,67f81b1..1e84e8e
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -12,7 -12,7 +12,7 @@@ libnl-SVNPATH                 := http://svn.planet-la
  util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-20
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
  # Trellis-specific NodeManager plugins
  NodeManager-topo-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
  NodeManager-optin-SVNPATH     := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@@ -27,7 -27,7 +27,7 @@@ vsys-GITPATH                  := git://git.planet-lab.
  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 +46,8 @@@ pyplnet-GITPATH                       := git://git.planet-l
  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
diff --combined planetlab-tags.mk
index 94c10b1,8f521b6..0ea5435
--- 1/planetlab-tags.mk
--- 2/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@@ -16,7 -16,7 +16,7 @@@ util-vserver-pl-GITPATH               := git://git.p
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
  codemux-GITPATH                       := git://git.planet-lab.org/codemux.git@CoDemux-0.1-14
  fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@@ -28,7 -28,7 +28,7 @@@ vsys-GITPATH                  := git://git.planet-lab.
  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 +47,8 @@@ pyplnet-GITPATH                       := git://git.planet-l
  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
build