Merge branch '10700-dispatch'
authorTom Clegg <tom@curoverse.com>
Tue, 31 Jan 2017 21:32:05 +0000 (16:32 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 31 Jan 2017 21:32:05 +0000 (16:32 -0500)
commitc3d4f8a585202ec58df5506934b698039c200b68
treed53ed1e2fd40a340f5b9776181a79e654d5fa0a7
parent36360d1f2987cea89ce217a2519c01da7456d533
parenta19ffad966b25b3869e666f749f7c6da187bef68
Merge branch '10700-dispatch'

closes #10700
  refs #10701
closes #10702
closes #10703
closes #10704

Conflicts:
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go