projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
68c3fbc
d68db5e
)
Merge branch 'master' into 3036-collection-uuids
author
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 20:14:03 +0000
(16:14 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 20:14:03 +0000
(16:14 -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