[ARVADOS] updated: fcfd4428e2889ceb847b64b0819207c421de1abd

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/actions_controller.rb          |  2 +-
 .../workbench/test/integration/collections_test.rb | 29 +++++++++++++++++++++-
 services/api/test/fixtures/collections.yml         | 12 +++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

       via  fcfd4428e2889ceb847b64b0819207c421de1abd (commit)
       via  7149ee5d616b932a73fb7a311136e6db75020666 (commit)
       via  a124a5350d31001a7c66381fa853dfcd78dddd06 (commit)
       via  3ca013aedeae5b2085b8fb37ca80501117f0f918 (commit)
       via  3bf2514da60ab2e0b7639959b650cc4d93784080 (commit)
       via  f2ba19f987bfe7de245176e9fb4ea5e783564494 (commit)
      from  1ed38089f9d9969abde1849743f0fdf52d3d2d93 (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 fcfd4428e2889ceb847b64b0819207c421de1abd
Merge: 1ed3808 7149ee5
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 17:23:00 2014 -0400

    closes #4228
    Merge branch '4228-collection-subdir-files'


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


hooks/post-receive
--