Merge branch '12027-slurmfail-during-setup'
authorTom Clegg <tom@curoverse.com>
Wed, 26 Jul 2017 14:44:33 +0000 (10:44 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Jul 2017 14:44:33 +0000 (10:44 -0400)
refs #12027

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>


Trivial merge