[ARVADOS] updated: bb3ec0fefd17c68d9c0123dcfcc5e4ef616fb25e

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/projects_controller.rb         | 19 +++++++++++++++--
 apps/workbench/test/integration/projects_test.rb   | 23 +++++++++++++--------
 services/api/test/fixtures/collections.yml         | 24 ++++++++++++++++++++++
 services/fuse/tests/test_mount.py                  |  2 ++
 4 files changed, 57 insertions(+), 11 deletions(-)

       via  bb3ec0fefd17c68d9c0123dcfcc5e4ef616fb25e (commit)
       via  0fc69ec920fb2edf48a196adfbce1e7c66218f04 (commit)
       via  cad9d2f9fe930e51279a8496929857039deea2de (commit)
       via  88650e2c0020e1122449d7b91ad3ebf78bab9d23 (commit)
       via  44e4d85c32d5e4ea4dc651570672e59d7a10d3b3 (commit)
       via  8b4cd21c6bd056e4ebf7487132a454cb5b8aacc5 (commit)
       via  b0fa2109b62079c50c5228d227c591fde7b40ab7 (commit)
       via  77ad02138232ebf8885ceef5b4c398bf6fd39587 (commit)
       via  24fd61eb70995d505bd990a79339571294b8f6eb (commit)
       via  1a8481cd4ebacf2036090273bb6b9444dbed16a8 (commit)
       via  d7c09707b2b5146367c2988b75deffce21b5ae2c (commit)
      from  f9ec9073f2077d81567922d612d79e8bcf3a11ba (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 bb3ec0fefd17c68d9c0123dcfcc5e4ef616fb25e
Merge: f9ec907 0fc69ec
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 26 16:03:30 2014 -0400

    Merge branch 'master' into 3889-functional-testing
    
    Conflicts:
    	services/fuse/tests/test_mount.py

diff --cc services/fuse/tests/test_mount.py
index 69939ea,4af3467..e443f0d
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@@ -262,9 -262,8 +262,10 @@@ class FuseSharedTest(MountTestBase)
                            "Pipeline Template with Input Parameter with Search.pipelineTemplate",
                            "Pipeline Template with Jobspec Components.pipelineTemplate",
                            "collection_expires_in_future",
+                           "collection_with_same_name_in_aproject_and_home_project",
 -                          "pipeline_with_job.pipelineInstance"
 +                          "pipeline_to_merge_params.pipelineInstance",
 +                          "pipeline_with_job.pipelineInstance",
 +                          "pipeline_with_tagged_collection_input.pipelineInstance"
                        ], d2)
  
          d3 = os.listdir(os.path.join(self.mounttmp, 'Active User', 'A Project'))

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


hooks/post-receive
--