[ARVADOS] updated: df55660fc8748a317219043153f0bb54150086a8

[Git user]

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

       via  df55660fc8748a317219043153f0bb54150086a8 (commit)
       via  84906c7124ab9707b5ccca94c83471fa551d9992 (commit)
      from  b3f88934721fc97973b40786cae97e55e84b31d5 (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 df55660fc8748a317219043153f0bb54150086a8
Merge: b3f8893 84906c7
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu May 18 10:26:53 2017 -0400

    Merge branch '11590-log-reuse'
    
    refs #11590


commit 84906c7124ab9707b5ccca94c83471fa551d9992
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu May 18 10:26:35 2017 -0400

    11590: Clarify "job state" condition in log message.

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 83c99b1..5344d45 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -254,7 +254,7 @@ class Job < ArvadosModel
     candidates = candidates.where(
       'state = ? or (owner_uuid = ? and state in (?))',
       Job::Complete, current_user.uuid, [Job::Queued, Job::Running])
-    log_reuse_info { "have #{candidates.count} candidates after filtering on job state (either state=Complete, or state=Queued/Running and submitted by current user)" }
+    log_reuse_info { "have #{candidates.count} candidates after filtering on job state ((state=Complete) or (state=Queued/Running and (submitted by current user)))" }
 
     digest = Job.sorted_hash_digest(attrs[:script_parameters])
     candidates = candidates.where('script_parameters_digest = ?', digest)

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


hooks/post-receive
--