[ARVADOS] updated: 1.1.3-16-g5d164d7

[Git user]

Summary of changes:
 .../app/models/pipeline_instance_work_unit.rb      | 18 +++++++++++++
 apps/workbench/app/models/proxy_work_unit.rb       |  4 ++-
 .../_show_components_running.html.erb              |  2 ++
 .../test/integration/pipeline_instances_test.rb    | 30 ++++++++--------------
 apps/workbench/test/unit/work_unit_test.rb         |  1 +
 services/api/test/fixtures/pipeline_instances.yml  |  2 ++
 6 files changed, 37 insertions(+), 20 deletions(-)

       via  5d164d74505c232cfa232d69a56273da2d02b72a (commit)
       via  2517c98e6835fef0a9e9829773f058d7ced00462 (commit)
       via  948c4e583b89e28730f8a0d2ae3f94e459351b30 (commit)
      from  f309b872cc064141d9fbf43a15067998603e2204 (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 5d164d74505c232cfa232d69a56273da2d02b72a
Merge: f309b87 2517c98
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sun Feb 11 21:27:32 2018 -0500

    Merge branch '12840-cancelled-pipeline'
    
    fixes #12840
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
--