[haizea-commit] r546 - trunk/src/haizea/common

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2008-11-19 18:39:06 -0600 (Wed, 19 Nov 2008)
New Revision: 546

Modified:
   trunk/src/haizea/common/constants.py
Log:
Apparently I got my branches messed up and I don't know how to do a proper merge yet... :-P

Modified: trunk/src/haizea/common/constants.py
===================================================================
--- trunk/src/haizea/common/constants.py	2008-11-20 00:31:43 UTC (rev 545)
+++ trunk/src/haizea/common/constants.py	2008-11-20 00:39:06 UTC (rev 546)
@@ -99,7 +99,8 @@
 COUNTER_BESTEFFORTCOMPLETED="Best-effort completed"
 COUNTER_QUEUESIZE="Queue size"
 COUNTER_DISKUSAGE="Disk usage"
-COUNTER_CPUUTILIZATION="CPU utilization"
+COUNTER_CPUUTILIZATION="VM CPU utilization"
+COUNTER_UTILIZATION="Resource utilization"
 
 AVERAGE_NONE=0
 AVERAGE_NORMAL=1
@@ -110,3 +111,4 @@
 LOGLEVEL_VDEBUG = 5
 LOGLEVEL_STATUS = 25
 
+NO_MEMORY_OVERRIDE = -1
\ No newline at end of file