From: Tim Pierce Date: Mon, 19 May 2014 22:09:18 +0000 (-0400) Subject: Merge branch '2755-api-collection-permissions' of git.curoverse.com:arvados into... X-Git-Tag: 1.1.0~2612^2~3^2~2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1f43dd857829bd1134837c43a8ac5d653c0c68b1 Merge branch '2755-api-collection-permissions' of git.curoverse.com:arvados into 2755-api-collection-permissions Refs #2755 Conflicts: services/api/app/controllers/arvados/v1/collections_controller.rb services/api/config/application.default.yml services/api/config/application.yml.example services/api/test/functional/arvados/v1/collections_controller_test.rb --- 1f43dd857829bd1134837c43a8ac5d653c0c68b1