Merge branch 'master' into 6518-crunch2-dispatch-slurm
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Mar 2016 00:02:30 +0000 (20:02 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Mar 2016 00:02:30 +0000 (20:02 -0400)
commit2e437823d2d19edf5c6be392f3604a499308cd6e
tree4008f4ff620a62c338a690802f36d3c5dfda174a
parent62dff431b7fbe97479cf98ac38e529388e16494f
parenta301612e7c0f300c1d3ba68d31f0da61cbb2d020
Merge branch 'master' into 6518-crunch2-dispatch-slurm