Merge remote-tracking branch 'upstream/master' into s20-issue48181

pingcap · Dec 5, 2023 · 06ee151 · 06ee151
2 parents ceb4cea + ca9f4d3
commit 06ee151
Show file tree

Hide file tree

Showing 24 changed files with 491 additions and 234 deletions.
diff --git a/.github/licenserc.yml b/.github/licenserc.yml
@@ -28,6 +28,7 @@ header:
  - "**/*.example"
  - "**/*.patch"
  - "**/*.bzl"
+ - "**/.git/**"
  - ".codecov.yml"
  - "Jenkinsfile"
  - ".editorconfig"

diff --git a/br/pkg/lightning/backend/external/BUILD.bazel b/br/pkg/lightning/backend/external/BUILD.bazel
@@ -64,7 +64,7 @@ go_test(
  ],
  embed = [":external"],
  flaky = True,
- shard_count = 49,
+ shard_count = 48,
  deps = [
  "//br/pkg/lightning/backend/kv",
  "//br/pkg/lightning/common",