X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc-tags.mk;h=73bfe808303248a69c4cfc597983a2ff0d8fc82c;hb=ae03aed2a462c23e0ecc8d463c470d2f1f58b894;hp=fb547531ec9e27acb50eca09462ecff7f2db7241;hpb=9e2c4685e270bf05abc6b0cbf9df3ab81265fa15;p=build.git

diff --git a/lxc-tags.mk b/lxc-tags.mk
index fb547531..73bfe808 100644
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -5,8 +5,7 @@ procprotect-GITPATH		:= git://git.onelab.eu/procprotect.git@master
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
 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-BRANCH		:= lxc_devel
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@lxc_devel
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
 # 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