8099: 7263: Merge branch 'hgi/7263-even-better-busy-behavior' of github.com:wtsi...
authorTom Clegg <tom@curoverse.com>
Mon, 29 Feb 2016 21:00:39 +0000 (16:00 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 29 Feb 2016 21:00:39 +0000 (16:00 -0500)
commitfbd54468b13466839c24d880a3d041d0a49371af
tree58ad8ba013d190fea14274086a24297ad3b57b0d
parentad48bb33bf49e3fec668a0ccf788ad9b2ffcaa80
parent3c90228c2e0466b2e69c08e0ad610dd5d619b4f8
8099: 7263: Merge branch 'hgi/7263-even-better-busy-behavior' of github.com:wtsi-hgi/arvados into 8099-babysit-all-srun

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