[ARVADOS] updated: 46b124cc766e4e35e40c1c3e2c1b388816aa682a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb   |  1 +
 apps/workbench/app/models/arvados_api_client.rb            |  3 +++
 apps/workbench/config/application.default.yml              |  3 +++
 .../test/controllers/application_controller_test.rb        | 14 ++++++++++++++
 4 files changed, 21 insertions(+)

       via  46b124cc766e4e35e40c1c3e2c1b388816aa682a (commit)
       via  d80a6ec2bf1181da1ef5f2b6e575e83ca15562a8 (commit)
       via  a1a9b820c16e5526e99d6d1b576ea53e9bddbc24 (commit)
       via  655469d6a9e711ace01c018b5c7b7b3111ea6deb (commit)
       via  4fce5c64b5bc0b106e14533378de6488fd030f98 (commit)
      from  4f6b424e682892109740f6cb6b8f1af2612e7536 (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 46b124cc766e4e35e40c1c3e2c1b388816aa682a
Merge: 4f6b424 d80a6ec
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 25 19:00:55 2015 -0400

    closes #5556
    Merge branch '5556-collection-show-timeout'


commit d80a6ec2bf1181da1ef5f2b6e575e83ca15562a8
Merge: a1a9b82 4f6b424
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 25 15:47:17 2015 -0400

    Merge branch 'master' into 5556-collection-show-timeout


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


hooks/post-receive
--