[ARVADOS] updated: ee42981c6282567f787e33523a1bcf805d7d178a

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/virtual_machines_controller.rb |   10 +
 .../pipeline_instances/_running_component.html.erb |    3 +-
 .../views/users/_manage_virtual_machines.html.erb  |   12 +
 .../app/views/virtual_machines/webshell.html.erb   |   49 +
 apps/workbench/config/application.default.yml      |   10 +
 apps/workbench/config/routes.rb                    |    1 +
 apps/workbench/public/webshell/README              |    3 +
 apps/workbench/public/webshell/enabled.gif         |  Bin 0 -> 847 bytes
 apps/workbench/public/webshell/keyboard.html       |   62 +
 apps/workbench/public/webshell/keyboard.png        |  Bin 0 -> 808 bytes
 apps/workbench/public/webshell/shell_in_a_box.js   | 4835 ++++++++++++++++++++
 apps/workbench/public/webshell/styles.css          |  272 ++
 docker/build_tools/Makefile                        |    4 +-
 docker/jobs/Dockerfile                             |   29 +-
 docker/{base => jobs}/apt.arvados.org.list         |    0
 services/keepstore/bufferpool.go                   |   19 +
 services/keepstore/handlers.go                     |   75 +-
 services/keepstore/keepstore_test.go               |   37 -
 services/keepstore/volume_unix.go                  |    2 +-
 services/keepstore/volume_unix_test.go             |   20 +
 20 files changed, 5347 insertions(+), 96 deletions(-)
 create mode 100644 apps/workbench/app/views/virtual_machines/webshell.html.erb
 create mode 100644 apps/workbench/public/webshell/README
 create mode 100644 apps/workbench/public/webshell/enabled.gif
 create mode 100644 apps/workbench/public/webshell/keyboard.html
 create mode 100644 apps/workbench/public/webshell/keyboard.png
 create mode 100644 apps/workbench/public/webshell/shell_in_a_box.js
 create mode 100644 apps/workbench/public/webshell/styles.css
 copy docker/{base => jobs}/apt.arvados.org.list (100%)

       via  ee42981c6282567f787e33523a1bcf805d7d178a (commit)
       via  7e5b8ba9e260669bc6fd85c201c4f771bceaa1b0 (commit)
       via  340a9ffa3a84a8dc4d7b4413136c4f1719eb5591 (commit)
       via  20524cb833e736d4baed4dcadca6fcc6d8bcc7a8 (commit)
       via  5ee1f6c05fe8b491afead3697a05401511a4d4b4 (commit)
       via  5fa837af6e73abbcf70e66c6de785e3a24259328 (commit)
       via  c47db46c7f2aac3ad1b099d8716c44dbb9f8bbf6 (commit)
       via  abe3b885cf4b123ad6e36f6d4d9ae6695e0fa32e (commit)
       via  101003562d2b5af0fc90a115fbbad98898de3d50 (commit)
       via  a4926dfa88f36c529096f30b223a434479cd0eb8 (commit)
       via  6929750b2f8f1f0b01b40f0ac516ec5f9e431c4d (commit)
       via  264391e43f3fa3a73c1c274dd9970963e68b8ace (commit)
       via  959ab858881801060b292a71b6e694c4801ef2eb (commit)
       via  5b349796c7ddf23188c92dbe98e4ce75a2ac6ee6 (commit)
       via  c830768910678af42a92d8d0b63ac96d5636361c (commit)
       via  2414412bb3360e02a72e5459711cf077a5e50380 (commit)
       via  eb4fb5479e86795128e71ebd1bb478b50ff6d7c9 (commit)
       via  f19af5689832a7b28a60f433cea850ca06841230 (commit)
       via  1db6a725fdadd1c92d27a459b2ba2820e5722e97 (commit)
       via  c5e726ce0161166fcdac2eeda5e9939926152b7a (commit)
       via  1d73050943da34f9983c7b71eb9cd76a1f0aed5e (commit)
       via  8d0355a42caf66f40fe3007a43dc2c8b88712083 (commit)
       via  4e416c9872af5237494958d1bacd33eb17821732 (commit)
       via  484f12ee2767535a87272c3899967c29b1e13651 (commit)
       via  260e4dc4c2686fbcf3a6e3979c817d5a2a765c67 (commit)
       via  8375bf07eb52a68c8881164b7f9f89d4a454e3b3 (commit)
       via  2359eabb2e84dd9aa5109332c37b0f50aee896bc (commit)
      from  ad7c6e10909fd4ac10466d62a7b3e5a77804a233 (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 ee42981c6282567f787e33523a1bcf805d7d178a
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 13 16:28:48 2015 -0400

    6445: update the job status line also to use the job's finished_at time when task has none.

diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index 2ab8da1..63075f7 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -25,7 +25,8 @@
               <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
               <% cputime = tasks.map { |task|
                    if task.started_at and task.job_uuid == current_job[:uuid]
-                     (if task.finished_at then task.finished_at else Time.now() end) - task.started_at
+                      finished_at = task.finished_at || current_job[:finished_at] || Time.now()
+                      finished_at - task.started_at
                    else
                      0
                    end

commit 7e5b8ba9e260669bc6fd85c201c4f771bceaa1b0
Merge: ad7c6e1 340a9ff
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 13 16:26:08 2015 -0400

    Merge branch 'master' into 6445-incorrect-task-runtime-calc


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


hooks/post-receive
--