From 67722fc3ffbe78a878dc80c2fc5a98dc4af736fb Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 31 Oct 2017 19:02:29 -0700 Subject: [PATCH] vendor: upgrade coreos/bbolt to v1.3.1-coreos.3 And pin some other dependencies. Signed-off-by: Gyu-Ho Lee --- cmd/vendor/github.com/coreos/bbolt/bolt_windows.go | 2 +- glide.lock | 6 +++--- glide.yaml | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/vendor/github.com/coreos/bbolt/bolt_windows.go b/cmd/vendor/github.com/coreos/bbolt/bolt_windows.go index 77b66f8b1d2..ca6f9a11c24 100644 --- a/cmd/vendor/github.com/coreos/bbolt/bolt_windows.go +++ b/cmd/vendor/github.com/coreos/bbolt/bolt_windows.go @@ -62,7 +62,7 @@ func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) erro if timeout != 0 { t = time.Now() } - fd := db.file.Fd() + fd := f.Fd() var flag uint32 = flagLockFailImmediately if exclusive { flag |= flagLockExclusive diff --git a/glide.lock b/glide.lock index f903e11b3ff..3137c409b80 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 80a7efc9ff8767f29e9a02c19337e00655b25cc19ffa0bb95adeb83e4776dedb -updated: 2017-10-19T23:09:56.080605596-06:00 +hash: 676b396852837415bb09adf5e734ad2d379ee4b5cded756d38031df2f797157c +updated: 2017-10-31T19:01:57.813466-07:00 imports: - name: github.com/beorn7/perks version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 @@ -8,7 +8,7 @@ imports: - name: github.com/bgentry/speakeasy version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd - name: github.com/coreos/bbolt - version: 54f6fad6e4859cf6c17d98577f5aab4903c3fdde + version: 3c6cbfb299c11444eb2f8c9d48f0d2ce09157423 - name: github.com/coreos/go-semver version: 8ab6407b697782a06568d4b7f1db25550ec2e4c6 subpackages: diff --git a/glide.yaml b/glide.yaml index 952e77e244c..d696d082015 100644 --- a/glide.yaml +++ b/glide.yaml @@ -5,7 +5,7 @@ import: - package: github.com/bgentry/speakeasy version: v0.1.0 - package: github.com/coreos/bbolt - version: v1.3.1-coreos.2 + version: v1.3.1-coreos.3 - package: github.com/coreos/go-semver version: v0.2.0 subpackages: @@ -20,6 +20,8 @@ import: version: v3 subpackages: - capnslog +- package: github.com/cpuguy83/go-md2man + version: 23709d0847197db6021a51fdb193e66e9222d4e7 - package: github.com/dustin/go-humanize version: 8929fe90cee4b2cb9deb468b51fb34eba64d1bf0 - package: github.com/ghodss/yaml @@ -28,6 +30,8 @@ import: version: v0.4 subpackages: - proto +- package: github.com/gorilla/websocket + version: 4201258b820c74ac8e6922fc9e6b52f71fe46f8d - package: github.com/golang/groupcache version: 02826c3e79038b59d737d3b1c0a1d937f71a4433 subpackages: