Merge branch 'master' into add-encryption-stream-backup

pingcap · Sep 9, 2024 · e78cd5f · e78cd5f
2 parents 6dfc2fa + fda2ec2
commit e78cd5f
Show file tree

Hide file tree

Showing 7 changed files with 349 additions and 196 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -20,9 +20,9 @@ aliases:
   sig-approvers-pb-coprocessor: [cfzjywxk]
   sig-approvers-pb-deadlock: [MyonKeminta, cfzjywxk]
   sig-approvers-pb-debug: [cfzjywxk]
-  sig-approvers-pb-pd: [niubell, rleungx]
-  sig-approvers-pb-raftstore: [zhangjinpeng1987, overvenus]
-  sig-approvers-pb-tikv: [zhangjinpeng1987]
+  sig-approvers-pb-pd: [niubell, rleungx, nolouch]
+  sig-approvers-pb-raftstore: [zhangjinpeng87, overvenus]
+  sig-approvers-pb-tikv: [zhangjinpeng87]
   sig-approvers-pb-error: [cfzjywxk]
   sig-approvers-pb-kvrpc: [cfzjywxk]
   sig-approvers-pb-trace: [you06]
diff --git a/pkg/deadlock/deadlock.pb.go b/pkg/deadlock/deadlock.pb.go