Merge branch 'master' into 3036-collection-uuids
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 19 Aug 2014 15:36:15 +0000 (11:36 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 19 Aug 2014 15:36:15 +0000 (11:36 -0400)
commit1a0a58c4f22af82e0a37440af3b0948771bca5e1
treeb02e4b9560465ab6f60c24e9aefae0aa9d7787bc
parent67c0a6e006f6e181204559dc28af16a8656878b8
parent6b0ad588b44ee30cd400e85031b56dcb2a8ac567
Merge branch 'master' into 3036-collection-uuids

Conflicts:
services/api/app/controllers/arvados/v1/collections_controller.rb
services/api/app/models/collection.rb
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/collections_controller.rb
services/api/app/controllers/arvados/v1/jobs_controller.rb
services/api/app/models/arvados_model.rb
services/api/app/models/collection.rb
services/api/app/models/job.rb
services/api/test/functional/arvados/v1/collections_controller_test.rb