Author: tmckay
Date: 2011-12-16 13:14:44 +0000 (Fri, 16 Dec 2011)
New Revision: 5180
Modified:
branches/stability/cumin/python/cumin/charts.py
branches/stability/cumin/python/cumin/grid/submission.py
Log:
BZ765713
BZ765846
svn merge -r 5177:HEAD
svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
Merging r5178 through r5179 into '.':
Modified: branches/stability/cumin/python/cumin/charts.py
===================================================================
--- branches/stability/cumin/python/cumin/charts.py 2011-12-15 22:39:09 UTC (rev 5179)
+++ branches/stability/cumin/python/cumin/charts.py 2011-12-16 13:14:44 UTC (rev 5180)
@@ -261,7 +261,7 @@
cr.fill()
if dev:
- cr.set_source_rgba(0, 0, 0, 0.1)
+ cr.set_source_rgba(1, 1, 1, 0.1)
half_dev = int(((float(dev) / float(self.y_max)) * self.height) / 2)
cr.move_to(x - dot_size, y - half_dev)
cr.line_to(x + dot_size, y - half_dev)
Modified: branches/stability/cumin/python/cumin/grid/submission.py
===================================================================
--- branches/stability/cumin/python/cumin/grid/submission.py 2011-12-15 22:39:09 UTC (rev
5179)
+++ branches/stability/cumin/python/cumin/grid/submission.py 2011-12-16 13:14:44 UTC (rev
5180)
@@ -675,7 +675,7 @@
# VM
- ad["VMPARAM_Kvm_Disk"] = "%s:vda:w" % image
+ ad["VMPARAM_vm_Disk"] = "%s:vda:w" % image
ad["JobVMType"] = "kvm"
ad["JobVMMemory"] = memory
ad["JobVM_VCPUS"] = 1