From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 19 May 2006 16:48:33 +0000 (+0000)
Subject: - merge revision 1.16
X-Git-Tag: planetlab-3_3-rc2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=05afab9a0efae422e73e48d9e563ceba83932143;p=build.git

- merge revision 1.16
date: 2006/05/01 21:52:52;  author: mlhuang;  state: Exp;  lines: +0 -8
- remove resman
---

diff --git a/planetlab.mk b/planetlab.mk
index c17b440b..f356ce9a 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: planetlab.mk,v 1.7.2.5 2006/05/08 19:05:09 mlhuang Exp $
+# $Id: planetlab.mk,v 1.7.2.6 2006/05/09 03:02:24 mlhuang Exp $
 #
 
 #
@@ -165,14 +165,6 @@ 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++: 
 #