14328: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --cc services/crunch-run/crunchrun.go
index 36d8394c7fcd67f111095004e03d8a3f68fea74a,7247b339d77942892945ea231f200a4e14004ac1..e5a1b94706c781cdc62e805e972c5f46ac0bba24
--- 1/services/crunch-run/crunchrun.go
--- 2/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@@ -1674,10 -1748,21 +1693,10 @@@ func NewContainerRunner(dispatcherClien
        cr.NewLogWriter = cr.NewArvLogWriter
        cr.RunArvMount = cr.ArvMountCmd
        cr.MkTempDir = ioutil.TempDir
-       cr.MkArvClient = func(token string) (IArvadosClient, IKeepClient, error) {
 -      cr.ListProcesses = func() ([]PsProcess, error) {
 -              pr, err := process.Processes()
 -              if err != nil {
 -                      return nil, err
 -              }
 -              ps := make([]PsProcess, len(pr))
 -              for i, j := range pr {
 -                      ps[i] = j
 -              }
 -              return ps, nil
 -      }
+       cr.MkArvClient = func(token string) (IArvadosClient, IKeepClient, *arvados.Client, error) {
                cl, err := arvadosclient.MakeArvadosClient()
                if err != nil {
-                       return nil, nil, err
+                       return nil, nil, nil, err
                }
                cl.ApiToken = token
                kc, err := keepclient.MakeKeepClient(cl)

diff --cc services/crunch-run/crunchrun_test.go
Simple merge