Merge branch 'master' into 9998-unsigned_manifest
authorTom Clegg <tom@curoverse.com>
Tue, 22 Nov 2016 18:35:06 +0000 (13:35 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 22 Nov 2016 18:35:06 +0000 (13:35 -0500)
commit4f4f6f5fe9367d5cd6c57070fd8a223efc87cb21
tree783ff2f4c5b11899222b30e05588a6454fddfb75
parenta57f8602e4a89e526464587c78e91c2086aae8d8
parent9c3cc0f61751720cfdea62717934746d1aa32b72
Merge branch 'master' into 9998-unsigned_manifest

Conflicts:
services/api/test/functional/arvados/v1/collections_controller_test.rb
services/api/app/controllers/arvados/v1/collections_controller.rb
services/api/test/functional/arvados/v1/collections_controller_test.rb