From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 31 Mar 2006 18:17:00 +0000 (+0000)
Subject: - merge revision 1.11
X-Git-Tag: planetlab-3_3-rc1~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=54c0860403d8c6c6f25e38ea2bda8ef11c875f66;p=build.git

- merge revision 1.11
date: 2006/03/31 18:14:59;  author: mlhuang;  state: Exp;  lines: +11 -3
- add resman back for now (need /usr/sbin/bwlimit for pl_mom)
---

diff --git a/planetlab.mk b/planetlab.mk
index 1a66b840..73ef919e 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: planetlab.mk,v 1.7.2.2 2006/03/30 16:34:37 mlhuang Exp $
 #
 
 #
@@ -165,6 +165,14 @@ pl_sshd-MODULE := pl_sshd
 pl_sshd-SPEC := pl_sshd/pl_sshd.spec
 ALL += pl_sshd
 
+#
+# Resource Management Tools
+#
+
+resman-MODULE := resman
+resman-SPEC := resman/resman.spec
+ALL += resman
+
 #
 # libhttpd++: 
 #