[ARVADOS] updated: ef3e10bdf2324f3c9e6427b3fd085e6b05e3877c

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |  15 +-
 .../app/controllers/collections_controller.rb      |   2 +
 apps/workbench/app/controllers/jobs_controller.rb  |   7 +-
 apps/workbench/app/models/arvados_base.rb          |  11 +-
 apps/workbench/app/models/job.rb                   |   4 +
 .../workbench/app/views/jobs/_show_status.html.erb |  93 ++++++
 apps/workbench/config/routes.rb                    |   4 +-
 sdk/cli/bin/arv-run-pipeline-instance              |   2 +-
 sdk/cli/bin/crunch-job                             |   9 +-
 .../app/controllers/arvados/v1/nodes_controller.rb |  12 +-
 services/api/app/models/job.rb                     |   2 +
 services/api/app/models/node.rb                    |   9 +
 .../20140530200539_add_supplied_script_version.rb  |   9 +
 services/api/db/schema.rb                          |   4 +-
 services/api/script/cancel_stale_jobs.rb           |  37 +++
 services/api/script/crunch-dispatch.rb             |   6 +-
 services/api/test/fixtures/nodes.yml               |   1 +
 .../arvados/v1/collections_controller_test.rb      |  29 +-
 .../functional/arvados/v1/nodes_controller_test.rb |  16 ++
 services/api/test/unit/node_test.rb                |  22 +-
 services/{keep => crunch/crunchstat}/go.sh         |   2 -
 .../src/arvados.org/crunchstat/crunchstat.go       | 311 +++++++++++++++++++++
 services/fuse/bin/arv-mount                        |  16 +-
 23 files changed, 593 insertions(+), 30 deletions(-)
 create mode 100644 apps/workbench/app/views/jobs/_show_status.html.erb
 create mode 100644 services/api/db/migrate/20140530200539_add_supplied_script_version.rb
 create mode 100755 services/api/script/cancel_stale_jobs.rb
 copy services/{keep => crunch/crunchstat}/go.sh (92%)
 create mode 100644 services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go

       via  ef3e10bdf2324f3c9e6427b3fd085e6b05e3877c (commit)
       via  879e1f31b0165c6abaa35a023ff66400757bb44b (commit)
       via  f0d8ab52b77f74e9294fe634207ce6e1ff9748a1 (commit)
       via  488a811374ff4bdeed9f2f2f57d9ef31d9369b5b (commit)
       via  2f3d49bde80526060d3337f13dfa91cd581ac222 (commit)
       via  6a8463eea9e32cb5cffcaf2f04667520794404ec (commit)
       via  fa87d357fdefd594b378cda9b4d73487df60d262 (commit)
       via  1f760632ae0fbb9f11af5cfb831b7c3ed49a7009 (commit)
       via  428973c03d4b4cd96adc80a514beffbb739d987a (commit)
       via  35c20b4ad8220131f7f6bad6b3806a7d28df3ef3 (commit)
       via  f48482bd37d3ae5a5f1aa488fa330f77c5fd640d (commit)
       via  0e7e57bbd8030c8144a18e43e68945ab11ad094c (commit)
       via  0b4f867ef14af38c07b910643fbe8cc6a93e6bb6 (commit)
       via  cea92754dfacf2b409d1f5b45dd0775fc44c842d (commit)
       via  f0bf04abdbb7e4b47be85585fba5789d695bb31e (commit)
       via  a163b0c7b5afa782281f67f0fa0ca0e4b41c518f (commit)
       via  a46f0152c44fe20eba4db38858eaa2f99bae83f2 (commit)
       via  3273eb53cd985cf13e1e0785ba853af2d0a8c2c6 (commit)
       via  1ec252c8087c1f167d969e26c584ff346f4ac457 (commit)
       via  bf7687829f5222375441cf75c7d82d82a4f508c4 (commit)
       via  137cd3ce818d4789355ea8d92cd2e2ea73318c4f (commit)
       via  f6f4efcf298d5c37b5eb8a88eb164cf8b77ae928 (commit)
       via  c7a21e6294f1eb905ace3d717f9dcfb4d4c39f0b (commit)
       via  9fd2051619bf6246708489e39515fb94b43a3199 (commit)
       via  ae09643622ecea00bab110f20029f01c83e1cf30 (commit)
       via  2a64eae3cf8363c596feda5337ea20ce356ca11f (commit)
       via  114df81b90be76e6921b9f20c9ddb272567c82e1 (commit)
       via  a276e40691a8f96b321879de2279159ef08b804f (commit)
       via  cb77d123755112d17f2e7bb2bd869d957d8a00f3 (commit)
       via  618a868118721baa683d151949759e1e9e516b4a (commit)
       via  cda441b1b6e50811c7dbd8d5c61ead1b39c91857 (commit)
       via  2c6c1cb11153849e87496bb8d1f5ff24f439a6a4 (commit)
       via  a0aba6d6dec99a25cc2622b49fb7d29634a3e8c3 (commit)
       via  4bf9e0c663789cbb748e628e8e86a8ea9ab047c5 (commit)
       via  2c77b59f16d698fa5368c2aa28f5c304c3f7e53b (commit)
       via  270a94c35d496daeabc39300611f727ce307f353 (commit)
       via  a285726d2297f71254529ab7d5b02f9246a0c413 (commit)
       via  e881778afbede03d32b842334113cba198052cfb (commit)
       via  18e7ea91bc5e9cd7cd1f25bd009a67e6fd2cc06b (commit)
       via  5779020e2f38bbc88dc436b33dcaf7dbd8292752 (commit)
       via  a975c45ec9908660db54b1f22399fc2c43488af5 (commit)
       via  09d3d4d177810ee9aea235eddbda9306f1aa5b7b (commit)
       via  f8d2097375c2d105b53de18a5ec7afdb7eb36b78 (commit)
       via  c67402c3d993007f7d925d605eb486d21df4e278 (commit)
       via  8ca3553c699e5fb2e026aa1ab0c0f20b6c43881f (commit)
      from  987b88a5441387ff91877464def7933064815b59 (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 ef3e10bdf2324f3c9e6427b3fd085e6b05e3877c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 9 11:41:19 2014 -0400

    2961: Collections show controller now delegates to super to handle tabs
    properly.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 7c6bab6..f4188b4 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -167,6 +167,8 @@ class CollectionsController < ApplicationController
                                                                :direction => :top_down,
                                                                :combine_jobs => :script_only,
                                                                :pdata_only => true}) rescue nil
+
+    super
   end
 
   def sharing_popup

commit 879e1f31b0165c6abaa35a023ff66400757bb44b
Merge: 987b88a f0d8ab5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 9 09:09:20 2014 -0400

    Merge remote-tracking branch 'origin/master' into 2961-load-tab-partials

diff --cc apps/workbench/app/controllers/jobs_controller.rb
index 03d5cb3,841d3a9..dc31229
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@@ -29,13 -27,17 +29,18 @@@ class JobsController < ApplicationContr
        generate_provenance(@objects)
      else
        @limit = 20
 -      super
      end
 +    super
    end
  
+   def cancel
+     @object.cancel
+     redirect_to @object
+   end
+ 
    def show
      generate_provenance([@object])
 +    super
    end
  
    def index_pane_list

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


hooks/post-receive
--