[ARVADOS] updated: 593e8c87cde8ea027ba2e321930a5243198a9f66

[git at public.curoverse.com]

Summary of changes:
 .../test/controllers/actions_controller_test.rb    | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

       via  593e8c87cde8ea027ba2e321930a5243198a9f66 (commit)
       via  0f3960f8f56c2330c07bc6f22d826279a8cd84e5 (commit)
      from  00c9cd4ecab3683d95118ab9d68310ac5069e9f6 (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 593e8c87cde8ea027ba2e321930a5243198a9f66
Merge: 00c9cd4 0f3960f
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 17:20:11 2015 -0400

    refs #5145
    Merge branch '5145-combine-collections-repeated-filenames'


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


hooks/post-receive
--