[ARVADOS] updated: fb049c7f6263217e3f6f4cd2b3c9f6bd0e4af490

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/collections_controller.rb      |  9 ---
 apps/workbench/app/models/arvados_base.rb          | 21 +++++-
 .../controllers/collections_controller_test.rb     |  7 ++
 .../collection_unit_test.rb                        |  7 +-
 .../collections_controller_test.rb                 |  6 +-
 apps/workbench/test/test_helper.rb                 | 34 ++++++---
 apps/workbench/test/unit/arvados_base_test.rb      | 81 ++++++++++++++++++++++
 .../integration/collections_performance_test.rb    |  2 +-
 .../api/test/unit/collection_performance_test.rb   |  4 +-
 9 files changed, 145 insertions(+), 26 deletions(-)
 create mode 100644 apps/workbench/test/unit/arvados_base_test.rb

       via  fb049c7f6263217e3f6f4cd2b3c9f6bd0e4af490 (commit)
       via  b193c49962deb916893e1ecb0ab04df8b00e3d7a (commit)
       via  ebdaedbc54c80730733c61cecb3998e26cf5ee7b (commit)
       via  375e0f68744fdd73f13921e8449de8c6fb232169 (commit)
       via  55f5486de7676b8906066b290ed0420b19f90eda (commit)
       via  24e15ff4b9d357d59827db9ec4f1bd165086eecb (commit)
       via  4e27d97b0161e56943a5828262a0fb873b826f22 (commit)
       via  4004979fcf1572336a86660b783fcdbebf658db7 (commit)
       via  c9f0347802b2d7b4844f283072c7931504e25ade (commit)
       via  95a1e7bbc1d6f931a0ea50cef9ceb1ea5074a76c (commit)
      from  01cc618477e897423d6144beb082792e06a0e6b6 (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 fb049c7f6263217e3f6f4cd2b3c9f6bd0e4af490
Merge: 01cc618 b193c49
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 4 10:27:04 2015 -0400

    Merge branch 'master' into 6203-collection-perf-api
    
    Conflicts:
    	apps/workbench/test/integration_performance/collection_unit_test.rb
    	apps/workbench/test/integration_performance/collections_controller_test.rb
    	services/api/test/integration/collections_performance_test.rb
    	services/api/test/unit/collection_performance_test.rb


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


hooks/post-receive
--