From: root Date: Wed, 1 Dec 2010 17:20:23 +0000 (-0500) Subject: Merge commit 'origin/master' X-Git-Tag: 5.0-rc17~58 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1fc4b2de3a7e19bb194bdd2b49d40ff5b5e78d7;p=build.git Merge commit 'origin/master' --- e1fc4b2de3a7e19bb194bdd2b49d40ff5b5e78d7 diff --cc onelab-k27-tags.mk index 1d181030,6d37ab17..8a40c758 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@@ -14,13 -14,13 +14,13 @@@ comgt-SVNPATH := http://svn.onelab.eu planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-9 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 (trunk). - util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-20 + util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21 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 diff --cc planetlab-k27-tags.mk index ccc8f5d4,384afb20..0589fb4b --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@@ -6,13 -6,13 +6,13 @@@ iptables-GITPATH := git: iptables-BUILD-FROM-SRPM := yes # tmp iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2 -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-9 util-vserver-BUILD-FROM-SRPM := yes # tmp libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 - util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-20 + util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21 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 diff --cc planetlab-k32-tags.mk index 8dbde645,842b6eb9..f2e4b300 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@@ -6,13 -6,13 +6,13 @@@ iptables-GITPATH := git: iptables-BUILD-FROM-SRPM := yes # tmp iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2 -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-8 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-9 util-vserver-BUILD-FROM-SRPM := yes # tmp libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 - util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-20 + util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21 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