git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 1c1bee7)
Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 17:10:28 +0000 (12:10 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 17:10:28 +0000 (12:10 -0500)
onelab-k27-tags.mk patch | blob | history
onelab-tags.mk patch | blob | history
planetlab-k27-tags.mk patch | blob | history
planetlab-k32-tags.mk patch | blob | history
planetlab-tags.mk patch | blob | history

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 2473e89..2136da3 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -40,16 +40,16 @@ PLCRT-SVNPATH                       := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
+ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-8
+sfa-GITPATH                    := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-6
-bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-5
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
 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-12
diff --git a/onelab-tags.mk b/onelab-tags.mk
index 9be4d9e..f8c7a52 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -21,7 +21,7 @@ util-vserver-pl-BRANCH                := 0.3
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32
 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@master
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-22
 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
@@ -31,9 +31,9 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 vsys-BRANCH                    := 0.9
 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@master
+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@master
+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
@@ -41,20 +41,20 @@ PLCRT-SVNPATH                       := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
+ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.onelab.eu/sfa.git@master
-sface-GITPATH                  := git://git.onelab.eu/sface.git@master
+sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-6
-bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-5
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
 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@master
+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@master
+tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-20
diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index da29612..d181961 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -35,7 +35,7 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-8
@@ -45,7 +45,7 @@ pyplnet-GITPATH                       := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-8
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
-bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
+bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
 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-12
diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 1e84e8e..4638698 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -35,7 +35,7 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-8
@@ -43,7 +43,7 @@ nodeconfig-SVNPATH            := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 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
+bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
 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-12
diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 0ea5435..396cd1d 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -36,7 +36,7 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-8
@@ -44,7 +44,7 @@ nodeconfig-SVNPATH            := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 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
+bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
 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-12
build