Merge branch 'master' into 3782-large-job-logs
authorTim Pierce <twp@curoverse.com>
Wed, 1 Oct 2014 19:43:15 +0000 (15:43 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 1 Oct 2014 19:43:15 +0000 (15:43 -0400)
commitedc5e4b6645b9b983a85a892bf3d3ad1432a657d
tree1c8d24fa026b4c8dfccf15c694842436a239a7eb
parent34e461fe9d33283d8e2135802ee9accb30a5e34f
parent359d96e3442f93094703a6966aecca9b0a90f55b
Merge branch 'master' into 3782-large-job-logs

Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/config/application.default.yml
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml