projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b11503
364c520
)
Merge branch '10808-admin-cancel-job'
author
Tom Clegg <tom@curoverse.com>
Thu, 5 Jan 2017 17:42:22 +0000
(12:42 -0500)
committer
Tom Clegg <tom@curoverse.com>
Thu, 5 Jan 2017 17:42:22 +0000
(12:42 -0500)
refs #10808
Trivial merge