[ARVADOS] updated: a311c787bd6f87abb6c1e4659cb02bc936b6ab9d

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/jobs/_show_log.html.erb   |   2 +-
 .../views/projects/_compute_node_status.html.erb   |   2 +-
 .../test/integration/collection_upload_test.rb     |   4 +-
 .../workbench/test/integration/collections_test.rb |   2 +-
 doc/api/schema/Job.html.textile.liquid             |   2 +-
 docker/api/Dockerfile                              |   3 +-
 docker/api/arvados-clients.yml.in                  |   1 +
 docker/api/ssh.sh                                  |  10 -
 docker/api/supervisor.conf                         |   2 +-
 docker/api/update-gitolite.rb                      |   6 +
 docker/arvdock                                     |  23 +-
 docker/base/Dockerfile                             |   6 +-
 docker/build_tools/build.rb                        |  17 --
 docker/build_tools/config.rb                       |   9 -
 docker/compute/Dockerfile                          |   1 -
 docker/compute/ssh.sh                              |  10 -
 docker/compute/supervisor.conf                     |   5 -
 docker/config.yml.example                          |   6 -
 docker/doc/apache2_foreground.sh                   |   5 -
 docker/jobs/Dockerfile                             |   3 +-
 docker/shell/Dockerfile                            |   2 +-
 docker/shell/setup.sh.in                           |   2 -
 docker/slurm/supervisor.conf                       |   7 -
 docker/sso/apache2_foreground.sh                   |   5 -
 docker/workbench/apache2_foreground.sh             |   7 +-
 sdk/cli/bin/crunch-job                             | 309 +++++++++++++++------
 services/api/Gemfile.lock                          |   2 +-
 .../arvados/v1/collections_controller.rb           |   2 +-
 services/api/app/models/arvados_model.rb           |   4 +
 services/api/app/models/job.rb                     |  31 +++
 services/api/script/crunch-dispatch.rb             | 238 +++++++++-------
 .../functional/arvados/v1/links_controller_test.rb |  17 +-
 .../functional/arvados/v1/logs_controller_test.rb  |   4 +-
 services/api/test/unit/job_test.rb                 |  29 ++
 34 files changed, 458 insertions(+), 320 deletions(-)
 delete mode 100755 docker/api/ssh.sh
 delete mode 100755 docker/compute/ssh.sh

       via  a311c787bd6f87abb6c1e4659cb02bc936b6ab9d (commit)
       via  4b88dab6ed8e3b583f0e4c1ea8b8e01adad4a6ad (commit)
       via  63f3b6068971a29723fd2b1902a0c71baaffa2f7 (commit)
       via  d980949ac4c092a44f3b64fb7cbd4a27a49256fb (commit)
       via  16384e6d47c96c21e9159ff70c809cac4e7d57da (commit)
       via  90501e4a6877d559d98bb94ce7b7825b463e055d (commit)
       via  4f78b5b86230394ab5b8545227915ce97cb3d36a (commit)
       via  1ae877538c5bebf22270b55e806af2ec7536a581 (commit)
       via  100e61fc48010dc50b26c8943ac4df67f45a1d20 (commit)
       via  b09686ba2ad8fedb5147a632c6edc3e68cdad171 (commit)
       via  050277d9f11f275fb8c2750e5e267e40da36d76a (commit)
       via  c3695bc7282996d66fb1922d7971aa86fb497968 (commit)
       via  780b29bc2d8cc7cc990303a62c23e8a629170f67 (commit)
       via  34e19752cbe87c94cb3da55426e3ae129a406814 (commit)
       via  6b2bc7d08926a7c5982748f30c4d0a48445a9a29 (commit)
      from  26196fc6633eb89ed3da425a73b601c5d1e376f2 (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 a311c787bd6f87abb6c1e4659cb02bc936b6ab9d
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Dec 10 00:54:23 2014 -0500

    3781: Fix test that assumes only one empty collection is readable.
    Wait longer for browser timeout in upload-fail test.

diff --git a/apps/workbench/test/integration/collection_upload_test.rb b/apps/workbench/test/integration/collection_upload_test.rb
index 1a3449f..9a26373 100644
--- a/apps/workbench/test/integration/collection_upload_test.rb
+++ b/apps/workbench/test/integration/collection_upload_test.rb
@@ -61,7 +61,9 @@ class CollectionUploadTest < ActionDispatch::IntegrationTest
     assert_selector 'button:not([disabled])', text: 'Start'
     click_button 'Start'
     if "test environment does not have a keepproxy yet, see #4534"
-      assert_text :visible, 'error'
+      using_wait_time 20 do
+        assert_text :visible, 'error'
+      end
     else
       assert_text :visible, 'Done!'
       visit sandbox_path+'.json'
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index a54d70f..201be6d 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -107,7 +107,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   test "can view empty collection" do
     uuid = 'd41d8cd98f00b204e9800998ecf8427e+0'
     visit page_with_token('active', "/collections/#{uuid}")
-    assert page.has_text?('This collection is empty')
+    assert page.has_text?(/This collection is empty|The following collections have this content/)
   end
 
   test "combine selected collections into new collection" do

commit 4b88dab6ed8e3b583f0e4c1ea8b8e01adad4a6ad
Merge: 26196fc 63f3b60
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Dec 10 00:00:51 2014 -0500

    3781: Merge branch 'master' into 3781-browser-upload


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


hooks/post-receive
--