[ARVADOS] updated: 6f1c0e1dd16f53ce4fb7e8785a130e5f588500e5

[Git user]

Summary of changes:
 .../app/controllers/application_controller.rb      |   5 +-
 .../controllers/container_requests_controller.rb   |  12 ++
 .../app/controllers/containers_controller.rb       |   3 +
 apps/workbench/app/models/container.rb             |   4 +
 apps/workbench/app/models/container_request.rb     |  10 ++
 apps/workbench/app/models/container_work_unit.rb   | 118 +++++++++++++++---
 apps/workbench/app/models/proxy_work_unit.rb       |  16 +--
 apps/workbench/app/models/work_unit.rb             |  24 ++++
 .../views/container_requests/_show_status.html.erb |   1 +
 .../app/views/containers/_show_status.html.erb     |  17 +++
 .../workbench/app/views/jobs/_show_status.html.erb |  13 +-
 .../app/views/projects/_show_dashboard.html.erb    |  11 +-
 .../app/views/work_unit/_component_detail.html.erb |  15 ++-
 .../app/views/work_unit/_show_status.html.erb      |   6 +
 apps/workbench/config/routes.rb                    |   4 +-
 .../test/integration/application_layout_test.rb    |  83 +++++++++++--
 apps/workbench/test/unit/work_unit_test.rb         |   1 +
 sdk/python/arvados/commands/ws.py                  |   2 +-
 sdk/python/arvados/keep.py                         |  28 ++++-
 sdk/python/tests/test_keep_client.py               |  67 ++++++++++-
 services/api/app/middlewares/rack_socket.rb        |   4 +
 services/api/app/models/container_request.rb       |  10 +-
 services/api/config/application.default.yml        |  10 ++
 services/api/config/database.yml.example           |   5 +-
 services/api/lib/eventbus.rb                       | 134 +++++++++++++--------
 services/api/test/fixtures/container_requests.yml  |  24 +++-
 services/api/test/fixtures/containers.yml          |   3 +-
 services/api/test/fixtures/pipeline_instances.yml  |  10 +-
 services/api/test/integration/websocket_test.rb    |  10 +-
 services/api/test/unit/container_request_test.rb   |   2 +-
 .../arvnodeman/computenode/driver/__init__.py      |   4 +
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |   6 +-
 32 files changed, 521 insertions(+), 141 deletions(-)
 create mode 100644 apps/workbench/app/views/container_requests/_show_status.html.erb
 create mode 100644 apps/workbench/app/views/containers/_show_status.html.erb
 create mode 100644 apps/workbench/app/views/work_unit/_show_status.html.erb

       via  6f1c0e1dd16f53ce4fb7e8785a130e5f588500e5 (commit)
       via  4744bcbfe19d352daa915a4249aacd4ccabaa505 (commit)
       via  8bb8e4cfe39e6b44142adca4721ba29467376e1d (commit)
       via  f17a26ca512ae0083ea5ad608ad6cfbb7fd247ee (commit)
       via  fa615bfa6748a0b552c4e3a33be1921f0760664e (commit)
       via  22e066d43cb09beb21c4cd5b12a787b81a00f97e (commit)
       via  9a44fb9de57a2f44347aecd26928eee03ea3c60c (commit)
       via  27b18bf9b168319660bdde4632ac4c3f359666d6 (commit)
       via  e60deecc14d9ac114a54747f7d3baf83ae6bdd3e (commit)
       via  f5bd38d4b168540ddb0e33db9e35a51ec5d60c17 (commit)
       via  a7d2ff32ec742b8feb38898694f1925b1e45c6eb (commit)
       via  6d910ff1327859e0eae9eed474ee360fb9c5894b (commit)
       via  2e5f6787e7b37a47247035803fba41354cbdabdd (commit)
       via  92b530ffbb5022192f00977183e591ae81240347 (commit)
       via  529dbc0b24f9dc06c3af1abaadd97374419d9507 (commit)
       via  4aaa1f6aeae33dc353ea3a70f901065b4f694fed (commit)
       via  adfc2c563d47c0eb70985245a1a7c4df004d7aa0 (commit)
       via  bfdf3d5b0ab2b2747321f3d5e2fc3e18f165fefd (commit)
       via  1f2bc01d1b9ad8aa742a8bec006d3f15e184dd5d (commit)
       via  6617a2ba4323d2f47566c89961763625fce2e1ca (commit)
       via  573d4de8f5471e071f8b1f72646cc02fd82c6bd1 (commit)
       via  5862c01a952d410b1237dc2a4a86cb844652a8d0 (commit)
       via  e7d49ab46462902a98d812b69d7257d837f85e90 (commit)
       via  cbd67fc6ba667bc27ca7e885145a6e34e5596f37 (commit)
       via  4a6b74c22201ceac36797b7722d52407eec63536 (commit)
       via  2d5ef50536851f8d190675a3bd74ee7567713ee0 (commit)
       via  e4c30dbf271df0633efce61c630a29c89bc43bff (commit)
       via  c12be4d7070ee3de978c1426c68071fb53f1dabd (commit)
       via  b3b64d046641ccc39e4f4d6fab85a8b831732d51 (commit)
       via  4d89b138dff0f1bcf1c867d529aff599fcc0cda2 (commit)
      from  691a08fd486e53ce656ae20fea84c2b3ec1a1088 (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 6f1c0e1dd16f53ce4fb7e8785a130e5f588500e5
Merge: 691a08f 4744bcb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jun 22 09:57:58 2016 -0400

    Merge branch 'master' into origin-8442-cwl-crunch2


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


hooks/post-receive
--