3550: Merge branch 'master' into 3550-local-pipeline

[arvados.git] / services / keepstore / keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index e5bd3bffb5450236981f3d2c336840b014383c1f..06054f5205cf7d38b01b179ee5365230120ccc89 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -4,7 +4,6 @@ import (
        "bytes"
        "flag"
        "fmt"
-       "git.curoverse.com/arvados.git/services/keepstore/pull_list"
        "io/ioutil"
        "log"
        "net"
@@ -97,7 +96,7 @@ var KeepVM VolumeManager
 // keepstore servers in order to increase data replication) with
 // atomic update methods that are safe to use from multiple
 // goroutines.
-var pullmgr *pull_list.Manager
+var pullmgr *BlockWorkList
 
 // TODO(twp): continue moving as much code as possible out of main
 // so it can be effectively tested. Esp. handling and postprocessing