nodemanager now uses same versioning as others - reflect in watched modules

diff --git a/coblitz-tags.mk b/coblitz-tags.mk
index 5a5b080..6287917 100644 (file)
--- a/coblitz-tags.mk
+++ b/coblitz-tags.mk
@@ -12,7 +12,6 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-4
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-#NodeManager-SVNBRANCH         := 1.8
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/trunk
 pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-3
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11

diff --git a/modules.list b/modules.list
index 9de10d1..ec46e36 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -6,7 +6,6 @@ Mom
 Monitor
 MyPLC
 NodeManager
-NodeManager:1.8
 NodeUpdate
 PLCAPI
 PLCRT

diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk
index 3c1f2ee..7fa8258 100644 (file)
--- a/planetbridge-tags.mk
+++ b/planetbridge-tags.mk
@@ -12,7 +12,6 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-4
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNBRANCH          := 1.8
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-7
 pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-3
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 42b5488..d4f9a14 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -15,7 +15,6 @@ util-vserver-pl-SVNBRANCH     := trellis
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-4
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNBRANCH          := 1.8
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-4
 # Trellis-specific NodeManager plugins 
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk

diff --git a/trellis-tags.mk b/trellis-tags.mk
index 21c8c8c..138e340 100644 (file)
--- a/trellis-tags.mk
+++ b/trellis-tags.mk
@@ -15,7 +15,6 @@ util-vserver-pl-SVNBRANCH     := trellis
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-4
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNBRANCH          := 1.8
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-11
 # Trellis-specific NodeManager plugins 
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk