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)
closes #10700
  refs #10701
closes #10702
closes #10703
closes #10704

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

1  2 
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go

index f1f5d1e6b84df0473ffdbe71edb64342cca16d81,60dc6071b40459ccbab6920ba80727917a69d9eb..1c080f36ac13133b12ad4308fb62d6f53549ded3
@@@ -3,10 -3,14 +3,9 @@@ package mai
  // Dispatcher service for Crunch that submits containers to the slurm queue.
  
  import (
+       "bytes"
        "flag"
        "fmt"
-       "io"
-       "io/ioutil"
 -      "git.curoverse.com/arvados.git/sdk/go/arvados"
 -      "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 -      "git.curoverse.com/arvados.git/sdk/go/config"
 -      "git.curoverse.com/arvados.git/sdk/go/dispatch"
 -      "github.com/coreos/go-systemd/daemon"
        "log"
        "math"
        "os"