Skip to content

Commit

Permalink
Updated vendored deps
Browse files Browse the repository at this point in the history
Using github.com/docker/libkv, which is unmaintained, instead of the one
maintained by the original author github.com/abronan/libkv as it has
references to coreos branch.

Fixed directly in vendor a bug in kv/etcd that introduces and error in keys.generated.go

We just delete the file that is rebuilt when build or run getconf:

    $ rm ../vendor/github.com/coreos/etcd/client/keys.generated.go

It is fixed in coreos/etcd master [issues/8715](etcd-io/etcd#8715)
so it will be available in next etcd client release.
  • Loading branch information
jllopis committed Oct 30, 2017
1 parent d915847 commit 565da58
Show file tree
Hide file tree
Showing 1,669 changed files with 403,695 additions and 13 deletions.
28 changes: 26 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,3 @@
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
name = "github.com/docker/libkv"
version = "0.2.1"
12 changes: 6 additions & 6 deletions kvstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"strings"
"time"

// "github.com/abronan/libkv"
// "github.com/abronan/libkv/store"
// "github.com/abronan/libkv/store/consul"
// "github.com/abronan/libkv/store/etcd/v3"
"github.com/docker/libkv"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/consul"
"github.com/docker/libkv/store/etcd"
// "github.com/abronan/libkv"
// "github.com/abronan/libkv/store"
// "github.com/abronan/libkv/store/consul"
// "github.com/docker/libkv/store/etcd"
)

Expand Down Expand Up @@ -69,8 +69,8 @@ func (gc *GetConf) EnableKVStore(opts *KVOptions) (*GetConf, error) {
return gc, errors.New("cannot create store consul")
}
gc.KVStore = kv
// case "etcd":
// etcd.Register()
case "etcd":
etcd.Register()

default:
return gc, errors.New("unknown backend")
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/coreos/etcd/.dockerignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/coreos/etcd/.github/ISSUE_TEMPLATE.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions vendor/github.com/coreos/etcd/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/coreos/etcd/.godir

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions vendor/github.com/coreos/etcd/.header

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 83 additions & 0 deletions vendor/github.com/coreos/etcd/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions vendor/github.com/coreos/etcd/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions vendor/github.com/coreos/etcd/DCO

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/coreos/etcd/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions vendor/github.com/coreos/etcd/Dockerfile-release

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions vendor/github.com/coreos/etcd/Dockerfile-release.arm64

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions vendor/github.com/coreos/etcd/Dockerfile-release.ppc64le

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/coreos/etcd/Documentation/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/github.com/coreos/etcd/Documentation/benchmarks/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 565da58

Please sign in to comment.