From: root <root@cassidy.cs.princeton.edu>
Date: Thu, 2 Dec 2010 12:35:19 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc17~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8082297d6066b0a17d7427df2d311d1612bf31f8;hp=b35ab282b780713641970170f2996f916a9cec1a;p=build.git

Merge commit 'origin/master'
---

diff --git a/modules.list b/modules.list
index 356f5b23..c0320f07 100644
--- a/modules.list
+++ b/modules.list
@@ -2,16 +2,8 @@ bootcd
 bootmanager
 bootstrapfs
 codemux
-DistributedRateLimiting
-Mom
-Monitor
-myplc
-nodemanager
-NodeUpdate
-PLCRT
-PingOfDeath
-vserver-reference
 comgt
+DistributedRateLimiting
 drupal
 ejabberd
 fprobe-ulog
@@ -21,28 +13,37 @@ iproute2
 iptables
 iptables:1.3.8
 libnl
+linux-2.6
 linux-2.6:22
 madwifi
 madwifi:0.9.4
+Mom
+Monitor
+myplc
 nodeconfig
+nodemanager
+nodeupdate
 nozomi
 omf
 pcucontrol
 pf2slice
-pl_sshd
+PingOfDeath
 planetlab-umts-tools
 plcapi
+PLCRT
 plewww
+pl_sshd
 pyaspects
 pyopenssl
 pypcilib
 pyplnet
 sfa
+sface
 tests
 util-vserver
 util-vserver-pl
 util-vserver-pl:0.3
-util-vserver:scholz
+vserver-reference
 vsys-scripts
 vsys:0.9
 www-register-wizard
diff --git a/modules.update b/modules.update
index 14f41faa..efbbc968 100755
--- a/modules.update
+++ b/modules.update
@@ -12,4 +12,4 @@ fcdistro=centos5
   make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
   make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
   echo tests
-) | sort -u | grep -v '^build$' 
+) | sort -uf | grep -v '^build$'