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)
commitcf8c09785fece3f454af5bc012c5143e44c9342b
treeb7e3d0f758232168e81801cfd64225234bfba42b
parent4ad076c659f9245494aa46609fa7741dd94c94a9
parent4726a67ad33df26cb84ee9bf4fca6c774ab7ced2
Merge branch '12908-slurm-cons-res'

fixes #12908

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