[ARVADOS] updated: 9daebff7dfeaa7092da078f3a0bfdc0c9d8e51e0

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/job.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

       via  9daebff7dfeaa7092da078f3a0bfdc0c9d8e51e0 (commit)
      from  3d84dd62a85647e9b3dfc34af8303c09b9923498 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9daebff7dfeaa7092da078f3a0bfdc0c9d8e51e0
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 25 09:16:14 2014 -0400

    3988: Job.queue uses "state = Queued" instead of previous multi-column-null test.

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index b4aa625..1bf17cc 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -64,9 +64,7 @@ class Job < ArvadosModel
   end
 
   def self.queue
-    self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ? and success is ?',
-               nil, nil, nil, nil).
-      order('priority desc, created_at')
+    self.where('state = ?', Queued).order('priority desc, created_at')
   end
 
   def queue_position

-----------------------------------------------------------------------


hooks/post-receive
--