projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ad076c 4726a67)
Merge branch '12908-slurm-cons-res'
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 8 Jan 2018 16:02:51 +0000 (11:02 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 8 Jan 2018 16:02:51 +0000 (11:02 -0500)
fixes #12908

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge