Merge branch 'master' into remove-config-dependency

tikv · Dec 13, 2022 · bae43ea · bae43ea
2 parents 74f9786 + aa3ab28
commit bae43ea
Show file tree

Hide file tree

Showing 30 changed files with 610 additions and 654 deletions.
diff --git a/pkg/election/leadership.go b/pkg/election/leadership.go
@@ -22,8 +22,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/storage/kv"
 	"github.com/tikv/pd/pkg/utils/etcdutil"
-	"github.com/tikv/pd/server/storage/kv"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/mvcc/mvccpb"
 	"go.uber.org/zap"