From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 9 Jul 2012 09:23:39 +0000 (+0200)
Subject: adopting tag nodemanager-2.1-6 manually
X-Git-Tag: 5.0-rc28~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=846607bd61de2959bff4ef3dd7af94e56a1aa883;p=build.git

adopting tag nodemanager-2.1-6 manually
---

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index cef13c46..5a80cf53 100644
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -21,7 +21,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.1-6
 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
diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 4f5517c6..4483660e 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.1-5
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.1-6
 # 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