Merge branch 'master' into tickerleak

pingcap · Dec 5, 2022 · dd1406b · dd1406b
2 parents 627db90 + 0219087
commit dd1406b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 26 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -4132,10 +4132,6 @@ def go_deps():
         name = "io_etcd_go_etcd_raft_v3",
         build_file_proto_mode = "disable_global",
         importpath = "go.etcd.io/etcd/raft/v3",
-        patch_args = ["-p1"],
-        patches = [
-            "//build/patches:io_etcd_go_etcd_raft_v3.patch",
-        ],
         sum = "h1:uCC37qOXqBvKqTGHGyhASsaCsnTuJugl1GvneJNwHWo=",
         version = "v3.5.2",
     )

diff --git a/build/patches/io_etcd_go_etcd_raft_v3.patch b/build/patches/io_etcd_go_etcd_raft_v3.patch