projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
359d96e
70b1ac0
)
Merge branch '3859-api-job-lock-method' refs #3859
author
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 2 Oct 2014 02:01:19 +0000
(22:01 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 2 Oct 2014 02:01:19 +0000
(22:01 -0400)
1
2
services/api/app/controllers/arvados/v1/jobs_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/arvados/v1/jobs_controller.rb
Simple merge
projects / arvados.git / commitdiff