Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12564 from dhermes/patch-1

Browse Source 
Adding `clientv3` import alias to match usage in `register_test.go`.
This commit is contained in:
Piotr Tabor 2021-01-19 23:00:19 +01:00 committed by GitHub
commit 5dcd459ae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdctl/go.mod
View File

@ -30,12 +30,12 @@ replace (
go.etcd.io/etcd/pkg/v3 => ../pkg
go.etcd.io/etcd/raft/v3 => ../raft
go.etcd.io/etcd/server/v3 => ../server
// go.etcd.io/etcd/v3 => ../
)
// Bad imports are sometimes causing attempts to pull that code.
// This makes the error more explicit.
replace (
go.etcd.io/etcd => ./FORBIDDEN_DEPENDENCY
go.etcd.io/etcd/v3 => ./FORBIDDEN_DEPENDENCY
go.etcd.io/tests/v3 => ./FORBIDDEN_DEPENDENCY
)

2
tests/integration/proxy/grpcproxy/register_test.go
View File

@ -18,7 +18,7 @@ import (
"testing"
"time"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/naming"
"go.etcd.io/etcd/pkg/v3/testutil"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy"