Merge branch 'master' of ssh://git.onelab.eu/git/build

Conflicts:
	onelab-tags.mk

diff --git a/mlab-tags.mk b/mlab-tags.mk
index 0ca8c36..d795213 100644 (file)
--- a/mlab-tags.mk
+++ b/mlab-tags.mk
@@ -15,7 +15,7 @@ iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptable
 # we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel
 # note that this should be consistently reflected in yumexclude
 ALL := $(filter-out iproute,$(ALL))
-util-vserver-GITPATH           := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-19
+util-vserver-GITPATH            := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-21
 libnl-GITPATH                  := git://git.planet-lab.org/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-28
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
@@ -44,7 +44,7 @@ monitor-GITPATH                       := git://git.planet-lab.org/monitor@monitor-3.1-6
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-GITPATH               := git://git.planet-lab.org/pyopenssl.git@pyopenssl-0.9-2
 ###
-pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2
+pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-24
@@ -55,9 +55,9 @@ pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16
 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-13
-bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.1-2
+bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.1-3
 sliceimage-GITPATH              := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-3
 nodeimage-GITPATH               := git://git.planet-lab.org/nodeimage.git@nodeimage-2.1-4
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.1-6
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.1-9
+tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.1-10

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 2a70db0..9cc19bb 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -16,13 +16,13 @@ iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4
 ###
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
-util-vserver-GITPATH            := git://git.onelab.eu/util-vserver.git@master
+util-vserver-GITPATH            := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-21
 libnl-GITPATH                  := git://git.onelab.eu/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-28
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.onelab.eu/plnode-utils.git@master
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.1-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-15
 fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2
@@ -42,7 +42,7 @@ monitor-GITPATH                 := git://git.onelab.eu/monitor.git@monitor-3.1-6
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 ###
-pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2
+pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-3
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 ###

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 82414fc..7975f88 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -13,13 +13,13 @@ iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptable
 # we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel
 # note that this should be consistently reflected in yumexclude
 ALL := $(filter-out iproute,$(ALL))
-util-vserver-GITPATH           := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-20
+util-vserver-GITPATH           := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-21
 libnl-GITPATH                  := git://git.planet-lab.org/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-28
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH           := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.1-21
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.1-22
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@ -41,7 +41,7 @@ monitor-GITPATH                       := git://git.planet-lab.org/monitor@monitor-3.1-6
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-GITPATH               := git://git.planet-lab.org/pyopenssl.git@pyopenssl-0.9-2
 ###
-pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2
+pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-24
@@ -57,4 +57,4 @@ sliceimage-GITPATH              := git://git.planet-lab.org/sliceimage.git@maste
 nodeimage-GITPATH               := git://git.planet-lab.org/nodeimage.git@master
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.1-6
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.1-9
+tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.1-10