[ARVADOS] updated: 180074677191e4f30f90e8b8390245ab356b1c3f

[Git user]

Summary of changes:
 apps/workbench/app/models/proxy_work_unit.rb | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

       via  180074677191e4f30f90e8b8390245ab356b1c3f (commit)
      from  6eae76355f346740cc50ddba4656239c507461ac (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 180074677191e4f30f90e8b8390245ab356b1c3f
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Wed May 24 10:47:56 2017 -0300

    11501: Don't filter out reused children when calculating running time.
    Use always wall time when saying how much time passed after completion/failure.

diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index 86e8b7c..0bfc753 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -229,12 +229,7 @@ class ProxyWorkUnit < WorkUnit
     else
       contributors << self
     end
-    # Avoid counting reused containers
-    if started_at
-      contributors.flatten.reject{|c| c.started_at ? c.started_at < started_at : true}
-    else
-      contributors.flatten
-    end
+    contributors.flatten
   end
 
   def runningtime
@@ -261,11 +256,7 @@ class ProxyWorkUnit < WorkUnit
         resp << "has been active for "
       end
 
-      if walltime > running_time
-        resp << ApplicationController.helpers.render_time(walltime, false)
-      else
-        resp << ApplicationController.helpers.render_time(running_time, false)
-      end
+      resp << ApplicationController.helpers.render_time(walltime, false)
 
       if finished_at
         resp << " at "

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


hooks/post-receive
--