From: root Date: Wed, 1 Dec 2010 17:00:25 +0000 (-0500) Subject: Merge commit 'origin/master' X-Git-Tag: 5.0-rc17~61 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1c1bee743ed5b56e3c44345c0d93268d229875ef;hp=4b34b4a979ec535f31ea0d1a0559c5aa0641df39;p=build.git Merge commit 'origin/master' --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 45be78f9..2473e893 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -20,7 +20,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 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 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index e76a7cdb..da296125 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -12,7 +12,7 @@ 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 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 --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 67f81b1b..1e84e8e8 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -12,7 +12,7 @@ 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 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 --git a/planetlab-tags.mk b/planetlab-tags.mk index 8f521b62..0ea54353 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -16,7 +16,7 @@ util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vs 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