Merge pull request etcd-io#6617 from gyuho/vendor-update

vendor: update glide and grpc-go
adamgomulka · Oct 10, 2016 · d7f69d0 · d7f69d0
2 parents 3a6fe61 + 4a07bbe
commit d7f69d0
Show file tree

Hide file tree

Showing 24 changed files with 336 additions and 1,486 deletions.
diff --git a/clientv3/balancer.go b/clientv3/balancer.go
@@ -72,7 +72,7 @@ func newSimpleBalancer(eps []string) *simpleBalancer {
 	return sb
 }
 
-func (b *simpleBalancer) Start(target string) error { return nil }
+func (b *simpleBalancer) Start(target string, config grpc.BalancerConfig) error { return nil }
 
 func (b *simpleBalancer) ConnectNotify() <-chan struct{} {
 	b.mu.Lock()

diff --git a/cmd/vendor/github.com/cpuguy83/go-md2man/md2man.go b/cmd/vendor/github.com/cpuguy83/go-md2man/md2man.go
diff --git a/cmd/vendor/github.com/golang/groupcache/byteview.go b/cmd/vendor/github.com/golang/groupcache/byteview.go