From 3dcf1e61cfa2d9ff73aa551a4afc97d3a766bb8e Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 11 Nov 2019 14:55:44 +0000 Subject: [PATCH] cache: follow move of upstream library github.com/coreos/bbolt github.com/etcd-io/bbolt --- backend/cache/storage_persistent.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/{coreos => etcd-io}/bbolt/.gitignore | 0 vendor/github.com/{coreos => etcd-io}/bbolt/.travis.yml | 0 vendor/github.com/{coreos => etcd-io}/bbolt/LICENSE | 0 vendor/github.com/{coreos => etcd-io}/bbolt/Makefile | 0 vendor/github.com/{coreos => etcd-io}/bbolt/README.md | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_386.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_amd64.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_arm.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_arm64.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_linux.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_mips64x.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_mipsx.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_openbsd.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_ppc.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_ppc64.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_ppc64le.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_riscv64.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_s390x.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_unix.go | 0 .../github.com/{coreos => etcd-io}/bbolt/bolt_unix_solaris.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bolt_windows.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/boltsync_unix.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/bucket.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/cursor.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/db.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/doc.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/errors.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/freelist.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/freelist_hmap.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/node.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/page.go | 0 vendor/github.com/{coreos => etcd-io}/bbolt/tx.go | 0 vendor/modules.txt | 4 ++-- 36 files changed, 6 insertions(+), 6 deletions(-) rename vendor/github.com/{coreos => etcd-io}/bbolt/.gitignore (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/.travis.yml (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/LICENSE (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/Makefile (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/README.md (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_386.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_amd64.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_arm.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_arm64.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_linux.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_mips64x.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_mipsx.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_openbsd.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_ppc.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_ppc64.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_ppc64le.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_riscv64.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_s390x.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_unix.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_unix_solaris.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bolt_windows.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/boltsync_unix.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/bucket.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/cursor.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/db.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/doc.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/errors.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/freelist.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/freelist_hmap.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/node.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/page.go (100%) rename vendor/github.com/{coreos => etcd-io}/bbolt/tx.go (100%) diff --git a/backend/cache/storage_persistent.go b/backend/cache/storage_persistent.go index 608a386b0..6221616f2 100644 --- a/backend/cache/storage_persistent.go +++ b/backend/cache/storage_persistent.go @@ -16,7 +16,7 @@ import ( "sync" "time" - bolt "github.com/coreos/bbolt" + bolt "github.com/etcd-io/bbolt" "github.com/pkg/errors" "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/walk" diff --git a/go.mod b/go.mod index 75d05bc97..fe7118a29 100644 --- a/go.mod +++ b/go.mod @@ -13,9 +13,9 @@ require ( github.com/atotto/clipboard v0.1.2 github.com/aws/aws-sdk-go v1.23.8 github.com/billziss-gh/cgofuse v1.1.0 - github.com/coreos/bbolt v1.3.3 github.com/djherbis/times v1.2.0 github.com/dropbox/dropbox-sdk-go-unofficial v5.4.0+incompatible + github.com/etcd-io/bbolt v1.3.3 github.com/google/go-cmp v0.3.1 // indirect github.com/google/go-querystring v1.0.0 // indirect github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect diff --git a/go.sum b/go.sum index 5461b6f3f..6a7c4c2d1 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,6 @@ github.com/billziss-gh/cgofuse v1.1.0/go.mod h1:LJjoaUojlVjgo5GQoEJTcJNqZJeRU0nC github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= -github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -75,6 +73,8 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dropbox/dropbox-sdk-go-unofficial v5.4.0+incompatible h1:9jnukMIowLSo3SY7+GTwxmYJv4QC0LxXbo97zHWCyoc= github.com/dropbox/dropbox-sdk-go-unofficial v5.4.0+incompatible/go.mod h1:lr+LhMM3F6Y3lW1T9j2U5l7QeuWm87N9+PPXo3yH4qY= github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +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/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= diff --git a/vendor/github.com/coreos/bbolt/.gitignore b/vendor/github.com/etcd-io/bbolt/.gitignore similarity index 100% rename from vendor/github.com/coreos/bbolt/.gitignore rename to vendor/github.com/etcd-io/bbolt/.gitignore diff --git a/vendor/github.com/coreos/bbolt/.travis.yml b/vendor/github.com/etcd-io/bbolt/.travis.yml similarity index 100% rename from vendor/github.com/coreos/bbolt/.travis.yml rename to vendor/github.com/etcd-io/bbolt/.travis.yml diff --git a/vendor/github.com/coreos/bbolt/LICENSE b/vendor/github.com/etcd-io/bbolt/LICENSE similarity index 100% rename from vendor/github.com/coreos/bbolt/LICENSE rename to vendor/github.com/etcd-io/bbolt/LICENSE diff --git a/vendor/github.com/coreos/bbolt/Makefile b/vendor/github.com/etcd-io/bbolt/Makefile similarity index 100% rename from vendor/github.com/coreos/bbolt/Makefile rename to vendor/github.com/etcd-io/bbolt/Makefile diff --git a/vendor/github.com/coreos/bbolt/README.md b/vendor/github.com/etcd-io/bbolt/README.md similarity index 100% rename from vendor/github.com/coreos/bbolt/README.md rename to vendor/github.com/etcd-io/bbolt/README.md diff --git a/vendor/github.com/coreos/bbolt/bolt_386.go b/vendor/github.com/etcd-io/bbolt/bolt_386.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_386.go rename to vendor/github.com/etcd-io/bbolt/bolt_386.go diff --git a/vendor/github.com/coreos/bbolt/bolt_amd64.go b/vendor/github.com/etcd-io/bbolt/bolt_amd64.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_amd64.go rename to vendor/github.com/etcd-io/bbolt/bolt_amd64.go diff --git a/vendor/github.com/coreos/bbolt/bolt_arm.go b/vendor/github.com/etcd-io/bbolt/bolt_arm.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_arm.go rename to vendor/github.com/etcd-io/bbolt/bolt_arm.go diff --git a/vendor/github.com/coreos/bbolt/bolt_arm64.go b/vendor/github.com/etcd-io/bbolt/bolt_arm64.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_arm64.go rename to vendor/github.com/etcd-io/bbolt/bolt_arm64.go diff --git a/vendor/github.com/coreos/bbolt/bolt_linux.go b/vendor/github.com/etcd-io/bbolt/bolt_linux.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_linux.go rename to vendor/github.com/etcd-io/bbolt/bolt_linux.go diff --git a/vendor/github.com/coreos/bbolt/bolt_mips64x.go b/vendor/github.com/etcd-io/bbolt/bolt_mips64x.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_mips64x.go rename to vendor/github.com/etcd-io/bbolt/bolt_mips64x.go diff --git a/vendor/github.com/coreos/bbolt/bolt_mipsx.go b/vendor/github.com/etcd-io/bbolt/bolt_mipsx.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_mipsx.go rename to vendor/github.com/etcd-io/bbolt/bolt_mipsx.go diff --git a/vendor/github.com/coreos/bbolt/bolt_openbsd.go b/vendor/github.com/etcd-io/bbolt/bolt_openbsd.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_openbsd.go rename to vendor/github.com/etcd-io/bbolt/bolt_openbsd.go diff --git a/vendor/github.com/coreos/bbolt/bolt_ppc.go b/vendor/github.com/etcd-io/bbolt/bolt_ppc.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_ppc.go rename to vendor/github.com/etcd-io/bbolt/bolt_ppc.go diff --git a/vendor/github.com/coreos/bbolt/bolt_ppc64.go b/vendor/github.com/etcd-io/bbolt/bolt_ppc64.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_ppc64.go rename to vendor/github.com/etcd-io/bbolt/bolt_ppc64.go diff --git a/vendor/github.com/coreos/bbolt/bolt_ppc64le.go b/vendor/github.com/etcd-io/bbolt/bolt_ppc64le.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_ppc64le.go rename to vendor/github.com/etcd-io/bbolt/bolt_ppc64le.go diff --git a/vendor/github.com/coreos/bbolt/bolt_riscv64.go b/vendor/github.com/etcd-io/bbolt/bolt_riscv64.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_riscv64.go rename to vendor/github.com/etcd-io/bbolt/bolt_riscv64.go diff --git a/vendor/github.com/coreos/bbolt/bolt_s390x.go b/vendor/github.com/etcd-io/bbolt/bolt_s390x.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_s390x.go rename to vendor/github.com/etcd-io/bbolt/bolt_s390x.go diff --git a/vendor/github.com/coreos/bbolt/bolt_unix.go b/vendor/github.com/etcd-io/bbolt/bolt_unix.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_unix.go rename to vendor/github.com/etcd-io/bbolt/bolt_unix.go diff --git a/vendor/github.com/coreos/bbolt/bolt_unix_solaris.go b/vendor/github.com/etcd-io/bbolt/bolt_unix_solaris.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_unix_solaris.go rename to vendor/github.com/etcd-io/bbolt/bolt_unix_solaris.go diff --git a/vendor/github.com/coreos/bbolt/bolt_windows.go b/vendor/github.com/etcd-io/bbolt/bolt_windows.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bolt_windows.go rename to vendor/github.com/etcd-io/bbolt/bolt_windows.go diff --git a/vendor/github.com/coreos/bbolt/boltsync_unix.go b/vendor/github.com/etcd-io/bbolt/boltsync_unix.go similarity index 100% rename from vendor/github.com/coreos/bbolt/boltsync_unix.go rename to vendor/github.com/etcd-io/bbolt/boltsync_unix.go diff --git a/vendor/github.com/coreos/bbolt/bucket.go b/vendor/github.com/etcd-io/bbolt/bucket.go similarity index 100% rename from vendor/github.com/coreos/bbolt/bucket.go rename to vendor/github.com/etcd-io/bbolt/bucket.go diff --git a/vendor/github.com/coreos/bbolt/cursor.go b/vendor/github.com/etcd-io/bbolt/cursor.go similarity index 100% rename from vendor/github.com/coreos/bbolt/cursor.go rename to vendor/github.com/etcd-io/bbolt/cursor.go diff --git a/vendor/github.com/coreos/bbolt/db.go b/vendor/github.com/etcd-io/bbolt/db.go similarity index 100% rename from vendor/github.com/coreos/bbolt/db.go rename to vendor/github.com/etcd-io/bbolt/db.go diff --git a/vendor/github.com/coreos/bbolt/doc.go b/vendor/github.com/etcd-io/bbolt/doc.go similarity index 100% rename from vendor/github.com/coreos/bbolt/doc.go rename to vendor/github.com/etcd-io/bbolt/doc.go diff --git a/vendor/github.com/coreos/bbolt/errors.go b/vendor/github.com/etcd-io/bbolt/errors.go similarity index 100% rename from vendor/github.com/coreos/bbolt/errors.go rename to vendor/github.com/etcd-io/bbolt/errors.go diff --git a/vendor/github.com/coreos/bbolt/freelist.go b/vendor/github.com/etcd-io/bbolt/freelist.go similarity index 100% rename from vendor/github.com/coreos/bbolt/freelist.go rename to vendor/github.com/etcd-io/bbolt/freelist.go diff --git a/vendor/github.com/coreos/bbolt/freelist_hmap.go b/vendor/github.com/etcd-io/bbolt/freelist_hmap.go similarity index 100% rename from vendor/github.com/coreos/bbolt/freelist_hmap.go rename to vendor/github.com/etcd-io/bbolt/freelist_hmap.go diff --git a/vendor/github.com/coreos/bbolt/node.go b/vendor/github.com/etcd-io/bbolt/node.go similarity index 100% rename from vendor/github.com/coreos/bbolt/node.go rename to vendor/github.com/etcd-io/bbolt/node.go diff --git a/vendor/github.com/coreos/bbolt/page.go b/vendor/github.com/etcd-io/bbolt/page.go similarity index 100% rename from vendor/github.com/coreos/bbolt/page.go rename to vendor/github.com/etcd-io/bbolt/page.go diff --git a/vendor/github.com/coreos/bbolt/tx.go b/vendor/github.com/etcd-io/bbolt/tx.go similarity index 100% rename from vendor/github.com/coreos/bbolt/tx.go rename to vendor/github.com/etcd-io/bbolt/tx.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 3d02cadc3..6ed7b6f7b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -63,8 +63,6 @@ github.com/aws/aws-sdk-go/service/sts github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/billziss-gh/cgofuse v1.1.0 github.com/billziss-gh/cgofuse/fuse -# github.com/coreos/bbolt v1.3.3 -github.com/coreos/bbolt # github.com/cpuguy83/go-md2man v1.0.10 github.com/cpuguy83/go-md2man/md2man # github.com/davecgh/go-spew v1.1.1 @@ -85,6 +83,8 @@ 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/protobuf v1.3.2 github.com/golang/protobuf/proto github.com/golang/protobuf/ptypes