Merge branch '10808-admin-cancel-job'
authorTom Clegg <tom@curoverse.com>
Thu, 5 Jan 2017 17:42:22 +0000 (12:42 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 5 Jan 2017 17:42:22 +0000 (12:42 -0500)
commit773a1afc99af74e8bb7c81cbbc9cb785d4f7920a
tree12dc061060faf443fbae648c7bf1dc92ead3b13d
parent3b1150386e2fd3513b98deca05ebd4a248ce3471
parent364c520d4d47a5edcf6f0e79e42757477b51d33d
Merge branch '10808-admin-cancel-job'

refs #10808