projects / arvados.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1f43dd857829bd1134837c43a8ac5d653c0c68b1
treeab9679c821ffdcdc683b8cf5cf7a5866e7465ebftree | snapshot
parentaad9cd74e61cff985944c400c40fe3f85907a1e7commit | diff
parentb12f667daa270a4e3c656d16f30620ca763f9578commit | diff
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
services/api/config/application.yml.example diff1 | diff2 | blob | history