[ARVADOS] updated: e5a9f73847bab2d27a9423bb1c237063f7739bef

[git at public.curoverse.com]

Summary of changes:
 services/api/script/crunch-dispatch.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

       via  e5a9f73847bab2d27a9423bb1c237063f7739bef (commit)
       via  c19e37b1452cc7c8234f05f2b0f2ce3ae2f0dff6 (commit)
      from  2e2ce40b47b9e248805dcccc59baa77591c13d79 (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 e5a9f73847bab2d27a9423bb1c237063f7739bef
Merge: c19e37b 2e2ce40
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 21 15:30:56 2014 -0400

    Merge branch 'master' of git.clinicalfuture.com:arvados


commit c19e37b1452cc7c8234f05f2b0f2ce3ae2f0dff6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 21 15:30:42 2014 -0400

    Fixed syntax error typo.  We need tests for crunch-dispatcher.rb!

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 9eb1c28..6df9a19 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -310,7 +310,7 @@ class Dispatcher
 
     jobrecord = Job.find_by_uuid(job_done.uuid)
     jobrecord.running = false
-    jobrecord.finished_at ||= Time.now,
+    jobrecord.finished_at ||= Time.now
     # Don't set 'jobrecord.success = false' because if the job failed to run due to an
     # issue with crunch-job or slurm, we want the job to stay in the queue.
     jobrecord.save!

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


hooks/post-receive
--