[ARVADOS] updated: 582c5f0092bd5a86367641bb208f74f95f0ef265

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |   3 +
 apps/workbench/Gemfile.lock                        |   5 +
 .../app/assets/javascripts/application.js          |   4 +
 apps/workbench/app/assets/javascripts/event_log.js | 312 +++++++++++++++++++++
 .../app/assets/javascripts/pipeline_instances.js   |   6 +-
 .../app/assets/stylesheets/application.css.scss    |   1 +
 .../workbench/app/assets/stylesheets/jobs.css.scss |   5 +
 apps/workbench/app/controllers/jobs_controller.rb  |  15 +
 apps/workbench/app/views/jobs/_show_log.html.erb   |   6 +-
 .../app/views/keep_disks/_content_layout.html.erb  |   3 -
 apps/workbench/config/routes.rb                    |   1 +
 apps/workbench/test/integration/websockets_test.rb |  41 +++
 apps/workbench/test/test_helper.rb                 |   6 +
 .../vendor/assets/javascripts/jquery.number.min.js |   2 +
 services/api/lib/simulate_job_log.rb               |  49 ++++
 services/api/lib/tasks/replay_job_log.rake         |   7 +
 services/api/script/crunch-dispatch.rb             |  12 +-
 services/api/test/job_logs/crunchstatshort.log     |   1 +
 18 files changed, 470 insertions(+), 9 deletions(-)
 create mode 100644 apps/workbench/vendor/assets/javascripts/jquery.number.min.js
 create mode 100644 services/api/lib/simulate_job_log.rb
 create mode 100644 services/api/lib/tasks/replay_job_log.rake
 create mode 100644 services/api/test/job_logs/crunchstatshort.log

       via  582c5f0092bd5a86367641bb208f74f95f0ef265 (commit)
       via  968526e233fede288bf332aab724c170fe88345c (commit)
       via  f4804e16eadabb6fa601449ef332a4235358c503 (commit)
       via  1af3397c28837ff61d3538e14b7358281b38097a (commit)
       via  7ab6b64c5fa3b958752ecb22751630b6e1016bd1 (commit)
       via  64756c0a3ef66cb37969f2bb594a56fb1a5ab40c (commit)
       via  244dddbbee9db8bc6fbc186462de9fe1986ea99d (commit)
       via  cbd9b9702b30ff610403c3f8630144630cdaafba (commit)
       via  5aecf0f1c591bc1f473b6bb56715ce8db5013268 (commit)
       via  f8991d36180bf9c2c261dee519b0c878306a35d5 (commit)
       via  45e0087ddae93d37206e539296e2ccd84391d46b (commit)
       via  23616a315b032181958ef05772870caa2eaf1277 (commit)
       via  6b49793347e98146ec96373a6b48f56fac46b881 (commit)
       via  5ac72e336a49d5a07e9ee36ba1f50473c57c45ec (commit)
       via  caaa4ae5c95c0f4b7a62702a4371bc9838661e72 (commit)
       via  eb26344db7daf2a595fa98fc72aee00b88e1633f (commit)
       via  37a96c457032ea9660c6342790667dcdb54b9609 (commit)
       via  5ea9de16b0500d7006ce5c7afd8e0776c4c588ca (commit)
       via  551258ddbe76b3ba8a9e741e42b3ae85914adb86 (commit)
       via  9f1c3e8177ffee8503a885bbb6786e7e42d3e257 (commit)
       via  e9835b9e368b23c4c2d8a0e0395456254ae1257d (commit)
       via  80649ee8eb1138e7a44ebb750ae62c675b193000 (commit)
       via  0e7cfa403cb80fc68d6c10c4c912e4d618fa085a (commit)
       via  84ff06d37f920ef6cf400189ea19edcf6158993c (commit)
       via  a65acb3945d8646c616b4f8a2654d1a346fdaf2d (commit)
       via  e9a19734c359fa52ec07a3ea4bb81b6382864596 (commit)
       via  7b9112dbc270ea338fee756f583bb76870f2e391 (commit)
       via  854af8067c6486193eb00917e2515f81ba776770 (commit)
       via  057d1e8a92c1333b6bd666d4d56c7d0e305265ae (commit)
       via  f2652e70c70db7a9a068c5a9bc8c6ec6566a14c6 (commit)
       via  e5d3458808720f0b2ad25ba2b2be6a867b9d836e (commit)
       via  b40e379090ff9a01db439a7d4b3b2162d150f89a (commit)
       via  9d4b0f36a978111fbd67fceb0ffb9e28d32aec14 (commit)
       via  26321ce3b54a0696982d55dabec7ff8082b146b9 (commit)
       via  07ad3d1e604624893a945d08666046cc69568dab (commit)
       via  73a8436194e335cfa3e208b2cc86350a2c35ae57 (commit)
       via  7139cabb0d75c946b53c128676d0597881ae2700 (commit)
       via  ec988adb09485a9d2c9c0315300b0ad52afc07ef (commit)
       via  e9ccda58ac1b7334cfeee8ab23dd37d9bf3f534d (commit)
       via  8aad5da5ec6c5fb29b513fbd340b64ce886127e0 (commit)
       via  c8d0498d60f99c1564a68fb6f613875840ca270c (commit)
       via  05c6711bac76f5270a2979c9d2ff767a686797d5 (commit)
       via  f2cf5a532e7dee1ab68948db89272a0e2579e781 (commit)
       via  cb03f98d530626bc31c55acdcf6e60f9596fc759 (commit)
       via  768f5281784b419e4d5617cb34e89298d1899a59 (commit)
       via  bce765931ead12469cb1d363a7974c3380191df6 (commit)
       via  23cebe864f7fe128aa784ef31fc14d0f3455aea5 (commit)
       via  708772bcec89c9abe02ceb3ed977a0f15091033d (commit)
       via  73c02220c31cd631b75b707d93709c8a60c21207 (commit)
      from  6f3346e85dacf1041de13f8961063b9f470c7255 (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 582c5f0092bd5a86367641bb208f74f95f0ef265
Merge: 6f3346e 968526e
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Nov 29 21:27:08 2014 -0500

    4446: Merge branch 'master' into 4446-nodes-index
    
    Conflicts:
    	apps/workbench/app/assets/javascripts/application.js

diff --cc apps/workbench/app/assets/javascripts/application.js
index c6d0182,796053b..af2e34e
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@@ -23,17 -23,18 +23,21 @@@
  //= require bootstrap3-editable/bootstrap-editable
  //= require bootstrap-tab-history
  //= require wiselinks
+ //= require raphael
+ //= require morris
+ //= require jquery.number.min
 +//= require handlebars
 +//= require ember
 +//= require ember-data
 +//= require_self
 +//= require workbench-ember
 +//= require_directory .
+ //= require_tree .
  
 -jQuery(function($){
 -    $.ajaxSetup({
 -        headers: {
 -            'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
 -        }
 -    });
 +// for more details see: http://emberjs.com/guides/application/
 +window.App = Ember.Application.create()
  
 +jQuery(function($){
      $(document).ajaxStart(function(){
        $('.modal-with-loading-spinner .spinner').show();
      }).ajaxStop(function(){

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


hooks/post-receive
--