diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2017-08-02 22:26:03 -0400 |
|---|---|---|
| committer | Dave Henderson <dhenderson@gmail.com> | 2017-08-02 22:36:43 -0400 |
| commit | d874842c9fe228083539b5ac729daecb00996bbf (patch) | |
| tree | e225225d6b50f1e4df67561b08960be0767f861e /vendor/github.com/docker | |
| parent | 673ff7f228b902b20fe3cf2d0c69c07f1256599b (diff) | |
Migrate from glide to dep
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'vendor/github.com/docker')
| -rw-r--r-- | vendor/github.com/docker/libkv/.travis.yml | 2 | ||||
| -rw-r--r-- | vendor/github.com/docker/libkv/MAINTAINERS | 6 | ||||
| -rw-r--r-- | vendor/github.com/docker/libkv/README.md | 6 | ||||
| -rw-r--r-- | vendor/github.com/docker/libkv/store/boltdb/boltdb.go | 7 |
4 files changed, 11 insertions, 10 deletions
diff --git a/vendor/github.com/docker/libkv/.travis.yml b/vendor/github.com/docker/libkv/.travis.yml index a7a3bcff..23ef6e05 100644 --- a/vendor/github.com/docker/libkv/.travis.yml +++ b/vendor/github.com/docker/libkv/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.7.1 + - 1.5.3 # let us have speedy Docker-based Travis workers sudo: false diff --git a/vendor/github.com/docker/libkv/MAINTAINERS b/vendor/github.com/docker/libkv/MAINTAINERS index 4a8bbc61..4dd59c7e 100644 --- a/vendor/github.com/docker/libkv/MAINTAINERS +++ b/vendor/github.com/docker/libkv/MAINTAINERS @@ -11,6 +11,7 @@ [Org] [Org."Core maintainers"] people = [ + "abronan", "aluzzardi", "sanimej", "vieux", @@ -24,6 +25,11 @@ # ADD YOURSELF HERE IN ALPHABETICAL ORDER + [people.abronan] + Name = "Alexandre Beslic" + Email = "abronan@docker.com" + GitHub = "abronan" + [people.aluzzardi] Name = "Andrea Luzzardi" Email = "al@docker.com" diff --git a/vendor/github.com/docker/libkv/README.md b/vendor/github.com/docker/libkv/README.md index ff2cc446..baad81b4 100644 --- a/vendor/github.com/docker/libkv/README.md +++ b/vendor/github.com/docker/libkv/README.md @@ -90,7 +90,7 @@ Calls like `WatchTree` may return different events (or number of events) dependi Only `Consul` and `etcd` have support for TLS and you should build and provide your own `config.TLS` object to feed the client. Support is planned for `zookeeper`. -## Roadmap +##Roadmap - Make the API nicer to use (using `options`) - Provide more options (`consistency` for example) @@ -98,10 +98,10 @@ Only `Consul` and `etcd` have support for TLS and you should build and provide y - Better key formatting - New backends? -## Contributing +##Contributing Want to hack on libkv? [Docker's contributions guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md) apply. -## Copyright and license +##Copyright and license Copyright © 2014-2016 Docker, Inc. All rights reserved, except as follows. Code is released under the Apache 2.0 license. The README.md file, and files in the "docs" folder are licensed under the Creative Commons Attribution 4.0 International License under the terms and conditions set forth in the file "LICENSE.docs". You may obtain a duplicate copy of the same license, titled CC-BY-SA-4.0, at http://creativecommons.org/licenses/by/4.0/. diff --git a/vendor/github.com/docker/libkv/store/boltdb/boltdb.go b/vendor/github.com/docker/libkv/store/boltdb/boltdb.go index cdfd74f8..4026e0a2 100644 --- a/vendor/github.com/docker/libkv/store/boltdb/boltdb.go +++ b/vendor/github.com/docker/libkv/store/boltdb/boltdb.go @@ -59,7 +59,6 @@ func New(endpoints []string, options *store.Config) (store.Store, error) { db *bolt.DB err error boltOptions *bolt.Options - timeout = transientTimeout ) if len(endpoints) > 1 { @@ -83,15 +82,11 @@ func New(endpoints []string, options *store.Config) (store.Store, error) { } } - if options.ConnectionTimeout != 0 { - timeout = options.ConnectionTimeout - } - b := &BoltDB{ client: db, path: endpoints[0], boltBucket: []byte(options.Bucket), - timeout: timeout, + timeout: transientTimeout, PersistConnection: options.PersistConnection, } |