Merge branch '3859-api-job-lock-method' refs #3859
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 2 Oct 2014 02:01:19 +0000 (22:01 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 2 Oct 2014 02:01:19 +0000 (22:01 -0400)
commit754495b451fb7dc65fe2d2c43fa4876638b0be66
tree51a8f8fbf5a8a06e1c5c22250ad090e7669fac78
parent359d96e3442f93094703a6966aecca9b0a90f55b
parent70b1ac0b5a02879bb5b60f651bf0810e8362f074
Merge branch '3859-api-job-lock-method' refs #3859
services/api/app/controllers/arvados/v1/jobs_controller.rb