drop bootmanager:lxc_devel now that it's merged back in master/5.2

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 855bcac..b06375c 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -35,9 +35,7 @@ omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-11
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-25
 sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 nodeconfig-GITPATH              := git://git.planet-lab.org/nodeconfig.git@master
-# this module still has changes that won't run on the mainstream distrib
-bootmanager-BRANCH             := lxc_devel
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxc_devel
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@master
 pypcilib-GITPATH                := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1

diff --git a/modules.list b/modules.list
index f83df33..f89a842 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -1,7 +1,6 @@
 bind_public
 bootcd
 bootmanager
-bootmanager:lxc_devel
 codemux
 comgt
 DistributedRateLimiting
@@ -20,7 +19,6 @@ myplc
 nodeconfig
 nodeimage
 nodemanager
-nodemanager:2.0
 nodeupdate
 omf
 oml