monit l.l p.y

[Jan-Henrik Haukeland]

CVSROOT:        /sources/monit
Module name:    monit
Changes by:     Jan-Henrik Haukeland <hauk>     06/06/12 20:10:10

Modified files:
        .              : l.l p.y 

Log message:
        Removed not used cfg tokens CPUUSAGE MEMUSAGE MEMKBYTE 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/monit/l.l?cvsroot=monit&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/monit/p.y?cvsroot=monit&r1=1.234&r2=1.235

Patches:
Index: l.l
===================================================================
RCS file: /sources/monit/monit/l.l,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- l.l 9 Apr 2006 20:50:59 -0000       1.110
+++ l.l 12 Jun 2006 20:10:10 -0000      1.111
@@ -34,7 +34,7 @@
  *   Martin Pala, <address@hidden>
  *
  *  CVS INFO
- *     $Id: l.l,v 1.110 2006/04/09 20:50:59 martinp Exp $
+ *     $Id: l.l,v 1.111 2006/06/12 20:10:10 hauk Exp $
  */
 
 #include <config.h>
@@ -219,9 +219,6 @@
 waitlimit         { return WAITLIMIT; }
 gracefullimit     { return GRACEFULLIMIT; }
 cleanuplimit      { return CLEANUPLIMIT; }
-cpuusage          { return CPUUSAGE; }
-memusage          { return MEMUSAGE; }
-memkbyte          { return MEMKBYTE; }
 mem(ory)?         { return MEMORY; }
 totalmem(ory)?    { return TOTALMEMORY; }
 cpu               { return CPU; }

Index: p.y
===================================================================
RCS file: /sources/monit/monit/p.y,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- p.y 10 May 2006 17:13:43 -0000      1.234
+++ p.y 12 Jun 2006 20:10:10 -0000      1.235
@@ -30,7 +30,7 @@
  *  @author Martin Pala <address@hidden>
  *  @author Christian Hopp <address@hidden>
  *  @author Rory Toma <address@hidden>
- *  @version \$Id: p.y,v 1.234 2006/05/10 17:13:43 martinp Exp $
+ *  @version \$Id: p.y,v 1.235 2006/06/12 20:10:10 hauk Exp $
  */
 
 #include <config.h>
@@ -261,7 +261,7 @@
 %token <number> CLEANUPLIMIT 
 %token <real> REAL
 %token CHECKPROC CHECKDEV CHECKFILE CHECKDIR CHECKHOST CHECKSYSTEM CHECKFIFO
-%token CPUUSAGE MEMUSAGE MEMKBYTE CHILDREN SYSTEM
+%token CHILDREN SYSTEM
 %token RESOURCE MEMORY TOTALMEMORY LOADAVG1 LOADAVG5 LOADAVG15 
 %token MODE ACTIVE PASSIVE MANUAL CPU CPUUSER CPUSYSTEM CPUWAIT
 %token GROUP REQUEST DEPENDS BASEDIR SLOT EVENTQUEUE