Skip to content

Commit a584801

Browse files
fishiuti-chi-bot
authored andcommitted
This is an automated cherry-pick of pingcap#56362
Signed-off-by: ti-chi-bot <[email protected]>
1 parent bbf8742 commit a584801

File tree

3 files changed

+1119
-0
lines changed

3 files changed

+1119
-0
lines changed

owner/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ go_test(
3232
],
3333
embed = [":owner"],
3434
flaky = True,
35+
<<<<<<< HEAD:owner/BUILD.bazel
36+
=======
37+
shard_count = 9,
38+
>>>>>>> afdd5c2ecd5 (owner: fix data race on ownerManager.campaignCancel (#56362)):pkg/owner/BUILD.bazel
3539
deps = [
3640
"//ddl",
3741
"//infoschema",

0 commit comments

Comments
 (0)