Use proper import path go.etcd.io/bbolt

Signed-off-by: Robert-André Mauchin <[email protected]>
yanel · Mar 3, 2020 · e2e400e · e2e400e
1 parent 4d8d1e2
commit e2e400e
Show file tree

Hide file tree

Showing 36 changed files with 4 additions and 7 deletions.
diff --git a/backend/cache/storage_persistent.go b/backend/cache/storage_persistent.go
@@ -16,10 +16,10 @@ import (
 	"sync"
 	"time"
 
-	bolt "github.com/etcd-io/bbolt"
 	"github.com/pkg/errors"
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/walk"
+	bolt "go.etcd.io/bbolt"
 )
 
 // Constants

diff --git a/go.mod b/go.mod
@@ -15,7 +15,6 @@ require (
 	github.com/billziss-gh/cgofuse v1.2.0
 	github.com/djherbis/times v1.2.0
 	github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible
-	github.com/etcd-io/bbolt v1.3.3
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
 	github.com/hanwen/go-fuse/v2 v2.0.3-0.20191108143333-152e6ac32d54
@@ -54,7 +53,7 @@ require (
 	github.com/xanzy/ssh-agent v0.2.1
 	github.com/youmark/pkcs8 v0.0.0-20191102193632-94c173a94d60
 	github.com/yunify/qingstor-sdk-go/v3 v3.2.0
-	go.etcd.io/bbolt v1.3.3 // indirect
+	go.etcd.io/bbolt v1.3.3
 	goftp.io/server v0.3.2
 	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
 	golang.org/x/net v0.0.0-20200222125558-5a598a2470a0

diff --git a/go.sum b/go.sum
@@ -106,8 +106,6 @@ github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible/go.mod h1:lr+Lh
 github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=
-github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

diff --git a/vendor/github.com/etcd-io/bbolt/.gitignore → vendor/go.etcd.io/bbolt/.gitignore b/vendor/github.com/etcd-io/bbolt/.gitignore → vendor/go.etcd.io/bbolt/.gitignore
diff --git a/vendor/github.com/etcd-io/bbolt/.travis.yml → vendor/go.etcd.io/bbolt/.travis.yml b/vendor/github.com/etcd-io/bbolt/.travis.yml → vendor/go.etcd.io/bbolt/.travis.yml
diff --git a/vendor/github.com/etcd-io/bbolt/LICENSE → vendor/go.etcd.io/bbolt/LICENSE b/vendor/github.com/etcd-io/bbolt/LICENSE → vendor/go.etcd.io/bbolt/LICENSE
diff --git a/vendor/github.com/etcd-io/bbolt/Makefile → vendor/go.etcd.io/bbolt/Makefile b/vendor/github.com/etcd-io/bbolt/Makefile → vendor/go.etcd.io/bbolt/Makefile
diff --git a/vendor/github.com/etcd-io/bbolt/README.md → vendor/go.etcd.io/bbolt/README.md b/vendor/github.com/etcd-io/bbolt/README.md → vendor/go.etcd.io/bbolt/README.md
diff --git a/vendor/github.com/etcd-io/bbolt/bolt_386.go → vendor/go.etcd.io/bbolt/bolt_386.go b/vendor/github.com/etcd-io/bbolt/bolt_386.go → vendor/go.etcd.io/bbolt/bolt_386.go
diff --git a/...or/github.com/etcd-io/bbolt/bolt_amd64.go → vendor/go.etcd.io/bbolt/bolt_amd64.go b/...or/github.com/etcd-io/bbolt/bolt_amd64.go → vendor/go.etcd.io/bbolt/bolt_amd64.go
diff --git a/vendor/github.com/etcd-io/bbolt/bolt_arm.go → vendor/go.etcd.io/bbolt/bolt_arm.go b/vendor/github.com/etcd-io/bbolt/bolt_arm.go → vendor/go.etcd.io/bbolt/bolt_arm.go
diff --git a/...or/github.com/etcd-io/bbolt/bolt_arm64.go → vendor/go.etcd.io/bbolt/bolt_arm64.go b/...or/github.com/etcd-io/bbolt/bolt_arm64.go → vendor/go.etcd.io/bbolt/bolt_arm64.go
diff --git a/...or/github.com/etcd-io/bbolt/bolt_linux.go → vendor/go.etcd.io/bbolt/bolt_linux.go b/...or/github.com/etcd-io/bbolt/bolt_linux.go → vendor/go.etcd.io/bbolt/bolt_linux.go
diff --git a/.../github.com/etcd-io/bbolt/bolt_mips64x.go → vendor/go.etcd.io/bbolt/bolt_mips64x.go b/.../github.com/etcd-io/bbolt/bolt_mips64x.go → vendor/go.etcd.io/bbolt/bolt_mips64x.go
diff --git a/...or/github.com/etcd-io/bbolt/bolt_mipsx.go → vendor/go.etcd.io/bbolt/bolt_mipsx.go b/...or/github.com/etcd-io/bbolt/bolt_mipsx.go → vendor/go.etcd.io/bbolt/bolt_mipsx.go
diff --git a/.../github.com/etcd-io/bbolt/bolt_openbsd.go → vendor/go.etcd.io/bbolt/bolt_openbsd.go b/.../github.com/etcd-io/bbolt/bolt_openbsd.go → vendor/go.etcd.io/bbolt/bolt_openbsd.go
diff --git a/vendor/github.com/etcd-io/bbolt/bolt_ppc.go → vendor/go.etcd.io/bbolt/bolt_ppc.go b/vendor/github.com/etcd-io/bbolt/bolt_ppc.go → vendor/go.etcd.io/bbolt/bolt_ppc.go
diff --git a/...or/github.com/etcd-io/bbolt/bolt_ppc64.go → vendor/go.etcd.io/bbolt/bolt_ppc64.go b/...or/github.com/etcd-io/bbolt/bolt_ppc64.go → vendor/go.etcd.io/bbolt/bolt_ppc64.go
diff --git a/.../github.com/etcd-io/bbolt/bolt_ppc64le.go → vendor/go.etcd.io/bbolt/bolt_ppc64le.go b/.../github.com/etcd-io/bbolt/bolt_ppc64le.go → vendor/go.etcd.io/bbolt/bolt_ppc64le.go
diff --git a/.../github.com/etcd-io/bbolt/bolt_riscv64.go → vendor/go.etcd.io/bbolt/bolt_riscv64.go b/.../github.com/etcd-io/bbolt/bolt_riscv64.go → vendor/go.etcd.io/bbolt/bolt_riscv64.go
diff --git a/...or/github.com/etcd-io/bbolt/bolt_s390x.go → vendor/go.etcd.io/bbolt/bolt_s390x.go b/...or/github.com/etcd-io/bbolt/bolt_s390x.go → vendor/go.etcd.io/bbolt/bolt_s390x.go
diff --git a/vendor/github.com/etcd-io/bbolt/bolt_unix.go → vendor/go.etcd.io/bbolt/bolt_unix.go b/vendor/github.com/etcd-io/bbolt/bolt_unix.go → vendor/go.etcd.io/bbolt/bolt_unix.go
diff --git a/...ub.com/etcd-io/bbolt/bolt_unix_solaris.go → vendor/go.etcd.io/bbolt/bolt_unix_solaris.go b/...ub.com/etcd-io/bbolt/bolt_unix_solaris.go → vendor/go.etcd.io/bbolt/bolt_unix_solaris.go
diff --git a/.../github.com/etcd-io/bbolt/bolt_windows.go → vendor/go.etcd.io/bbolt/bolt_windows.go b/.../github.com/etcd-io/bbolt/bolt_windows.go → vendor/go.etcd.io/bbolt/bolt_windows.go
diff --git a/...github.com/etcd-io/bbolt/boltsync_unix.go → vendor/go.etcd.io/bbolt/boltsync_unix.go b/...github.com/etcd-io/bbolt/boltsync_unix.go → vendor/go.etcd.io/bbolt/boltsync_unix.go
diff --git a/vendor/github.com/etcd-io/bbolt/bucket.go → vendor/go.etcd.io/bbolt/bucket.go b/vendor/github.com/etcd-io/bbolt/bucket.go → vendor/go.etcd.io/bbolt/bucket.go
diff --git a/vendor/github.com/etcd-io/bbolt/cursor.go → vendor/go.etcd.io/bbolt/cursor.go b/vendor/github.com/etcd-io/bbolt/cursor.go → vendor/go.etcd.io/bbolt/cursor.go
diff --git a/vendor/github.com/etcd-io/bbolt/db.go → vendor/go.etcd.io/bbolt/db.go b/vendor/github.com/etcd-io/bbolt/db.go → vendor/go.etcd.io/bbolt/db.go
diff --git a/vendor/github.com/etcd-io/bbolt/doc.go → vendor/go.etcd.io/bbolt/doc.go b/vendor/github.com/etcd-io/bbolt/doc.go → vendor/go.etcd.io/bbolt/doc.go
diff --git a/vendor/github.com/etcd-io/bbolt/errors.go → vendor/go.etcd.io/bbolt/errors.go b/vendor/github.com/etcd-io/bbolt/errors.go → vendor/go.etcd.io/bbolt/errors.go
diff --git a/vendor/github.com/etcd-io/bbolt/freelist.go → vendor/go.etcd.io/bbolt/freelist.go b/vendor/github.com/etcd-io/bbolt/freelist.go → vendor/go.etcd.io/bbolt/freelist.go
diff --git a/...github.com/etcd-io/bbolt/freelist_hmap.go → vendor/go.etcd.io/bbolt/freelist_hmap.go b/...github.com/etcd-io/bbolt/freelist_hmap.go → vendor/go.etcd.io/bbolt/freelist_hmap.go
diff --git a/vendor/github.com/etcd-io/bbolt/node.go → vendor/go.etcd.io/bbolt/node.go b/vendor/github.com/etcd-io/bbolt/node.go → vendor/go.etcd.io/bbolt/node.go
diff --git a/vendor/github.com/etcd-io/bbolt/page.go → vendor/go.etcd.io/bbolt/page.go b/vendor/github.com/etcd-io/bbolt/page.go → vendor/go.etcd.io/bbolt/page.go
diff --git a/vendor/github.com/etcd-io/bbolt/tx.go → vendor/go.etcd.io/bbolt/tx.go b/vendor/github.com/etcd-io/bbolt/tx.go → vendor/go.etcd.io/bbolt/tx.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -90,8 +90,6 @@ github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/team_common
 github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/team_policies
 github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/users
 github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/users_common
-# github.com/etcd-io/bbolt v1.3.3
-github.com/etcd-io/bbolt
 # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
 github.com/golang/groupcache/lru
 # github.com/golang/protobuf v1.3.3
@@ -216,6 +214,8 @@ github.com/yunify/qingstor-sdk-go/v3/request/signer
 github.com/yunify/qingstor-sdk-go/v3/request/unpacker
 github.com/yunify/qingstor-sdk-go/v3/service
 github.com/yunify/qingstor-sdk-go/v3/utils
+# go.etcd.io/bbolt v1.3.3
+go.etcd.io/bbolt
 # go.opencensus.io v0.22.3
 go.opencensus.io
 go.opencensus.io/internal