[ARVADOS] updated: c2a1512988551e03ce4270f9e936edde37f6c1b8

[Git user]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |   4 +
 apps/workbench/app/models/container_work_unit.rb   |  16 +++
 apps/workbench/app/models/job_work_unit.rb         |  50 ++++++-
 .../app/models/pipeline_instance_work_unit.rb      |  10 +-
 apps/workbench/app/models/proxy_work_unit.rb       | 152 +++++++++++++--------
 apps/workbench/app/models/work_unit.rb             |   4 -
 .../app/views/work_unit/_show_child.html.erb       |  22 +--
 .../app/views/work_unit/_show_component.html.erb   |  59 +-------
 8 files changed, 180 insertions(+), 137 deletions(-)

       via  c2a1512988551e03ce4270f9e936edde37f6c1b8 (commit)
       via  c554b80187e6e076cbf147b1abb34ed9eb36ce93 (commit)
       via  c400bf1e7a52d5557c2031bdf2c8de9957425577 (commit)
      from  8974e10fe2dbf643861f75cffa0fba9a6db972c8 (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 c2a1512988551e03ce4270f9e936edde37f6c1b8
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 6 20:37:01 2016 -0400

    8650: some more methods in ContainerWorkUnit

diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 301e6b6..5d4a353 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -20,6 +20,22 @@ class ContainerWorkUnit < ProxyWorkUnit
     get(:container_image)
   end
 
+  def runtime_constraints
+    get(:runtime_constraints)
+  end
+
+  def priority
+    get(:priority)
+  end
+
+  def log_collection
+    get(:log)
+  end
+
+  def output
+    get(:output)
+  end
+
   def uri
     uuid = get(:uuid)
     "/containers/#{uuid}"

commit c554b80187e6e076cbf147b1abb34ed9eb36ce93
Merge: 8974e10 c400bf1
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 6 20:29:30 2016 -0400

    Merge branch '8876-work-unit' into 8650-container-work-unit


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


hooks/post-receive
--