Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
authorradhika <radhika@curoverse.com>
Sat, 4 Jun 2016 23:19:20 +0000 (19:19 -0400)
committerradhika <radhika@curoverse.com>
Sat, 4 Jun 2016 23:19:20 +0000 (19:19 -0400)
commit10e7635b3627c7a70f9ed4bc5adee92854a3a274
tree5646f246dc37850841616c96eaba28d654cb4fc5
parentf9def1f7abc8ad6720d9b88ec541b00a03ff1d0e
parent8974e10fe2dbf643861f75cffa0fba9a6db972c8
Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units

Conflicts:
apps/workbench/app/views/work_unit/_progress.html.erb
apps/workbench/test/unit/work_unit_test.rb
apps/workbench/app/models/proxy_work_unit.rb
apps/workbench/app/models/work_unit.rb
apps/workbench/app/views/work_unit/_progress.html.erb
apps/workbench/test/unit/work_unit_test.rb
services/api/test/fixtures/containers.yml
services/api/test/fixtures/pipeline_instances.yml