Merge branch 'master' into 3859-api-job-lock-method
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 26 Sep 2014 15:02:06 +0000 (11:02 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 26 Sep 2014 15:02:06 +0000 (11:02 -0400)
commit2873926cdbfc8012b276db11d24cea3ad6a4bdd4
tree6db8dc2cf935c71f7c74cb26ffefc64f63477555
parent8bc77d6ee612217cfb50bca997ce3b94c19637e9
parent1b189a0961ba757caf6160285b59daa26c7cdcae
Merge branch 'master' into 3859-api-job-lock-method

Conflicts:
services/api/script/crunch-dispatch.rb
services/api/app/controllers/arvados/v1/jobs_controller.rb
services/api/app/models/job.rb
services/api/script/crunch-dispatch.rb