Merge branch 'master' into 8099-babysit-all-srun
authorTom Clegg <tom@curoverse.com>
Wed, 2 Mar 2016 17:16:19 +0000 (12:16 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 2 Mar 2016 17:16:19 +0000 (12:16 -0500)
commit19cb98ad222177fb7dd3613282446060e74dd2ce
tree9787a804d53d3be468a24c7f6f076525f672e4be
parent395d48a60ed557318833a5272ab00dce270cec40
parentb026643583d835a15d3baf6edef2df16ce678307
Merge branch 'master' into 8099-babysit-all-srun

Conflicts:
sdk/cli/bin/crunch-job
sdk/cli/bin/crunch-job