From: Thierry Parmentelat Date: Fri, 9 Dec 2011 08:29:10 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.0-rc25~5 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f7bca8d6e244e69d7b805c07ef6cc7c1018cdf98;hp=1055bc747c191d486f44e4406d1ddbe9a5b2b1c4;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index b0709144..6fd8d64d 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -25,7 +25,7 @@ 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-26 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 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@master +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-34 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-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 1d344f82..0ea8e584 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -9,7 +9,7 @@ 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-26 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 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-33 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-34 # 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 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index ab92398c..e269d71e 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -18,7 +18,7 @@ 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-26 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 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-33 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-34 # 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