Merge fixes

autolab · Apr 7, 2015 · ca035fe · ca035fe
1 parent ff28837
commit ca035fe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tangod.py b/tangod.py
@@ -97,7 +97,7 @@ def getJobs(self, item):
                 return self.jobQueue.deadJobs.values()
 
             elif item == 0:  # return the list of live jobs
-                return self.jobQueue.jobQueue.values()
+                return self.jobQueue.liveJobs.values()
 
             else:  # invalid parameter
                 return []
@@ -207,7 +207,7 @@ def resetTango(self, vmms):
                     log.warning("Killed these %s VMs on restart: %s" %
                                 (vmms_name, namelist))
 
-            for job in self.jobQueue.jobQueue.values():
+            for job in self.jobQueue.liveJobs.values():
                 self.log.debug("job: %s, assigned: %s" %
                                (str(job.name), str(job.assigned)))