projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62dff43
a301612
)
Merge branch 'master' into 6518-crunch2-dispatch-slurm
author
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Mar 2016 00:02:30 +0000
(20:02 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Mar 2016 00:02:30 +0000
(20:02 -0400)
Trivial merge