projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aad9cd7 b12f667)
Merge branch '2755-api-collection-permissions' of git.curoverse.com:arvados into...
authorTim Pierce <twp@curoverse.com>
Mon, 19 May 2014 22:09:18 +0000 (18:09 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 19:51:42 +0000 (15:51 -0400)
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

1  2 
services/api/config/application.yml.example patch | diff1 | diff2 | blob | history