Code

*: merge BR into TiDB#26655

Code

Merged

ti-chi-bot merged 22 commits intopingcap:masterpingcap/tidb:masterfrom 3pointer:merge_br_squash3pointer/tidb:merge_br_squashCopy head branch name to clipboardAug 5, 2021

+126,185-78

Commits

Commits on Aug 5, 2021

• Squashed 'br/' content from commit cf621d7c0

  Show description for f5053bc
  3pointer

  committed
  f5053bc

  Copy full SHA for f5053bc

• Merge commit 'f5053bc8f0b9594cdd5d45a7de8f110399eac49c' as 'br'

  3pointer

  committed
  1778c1a

  Copy full SHA for 1778c1a

• change the import path of br cmd/pkg

  3pointer

  committed
  86425ad

  Copy full SHA for 86425ad

• change the failpoint path of br/tests

  3pointer

  committed
  ef685b7

  Copy full SHA for ef685b7

• change the import path of br/web br/tools

  3pointer

  committed
  ac9fff4

  Copy full SHA for ac9fff4

• change the import path of tidb

  3pointer

  committed
  b81ec30

  Copy full SHA for b81ec30

• remove cycle depenence in go.mod

  3pointer

  committed
  f180a34

  Copy full SHA for f180a34

• update Makefile

  3pointer

  committed
  713b2ac

  Copy full SHA for 713b2ac

• change the import path after subtree update

  3pointer

  committed
  7ba8a29

  Copy full SHA for 7ba8a29

• update go mod after merge master

  3pointer

  committed
  adcd502

  Copy full SHA for adcd502

• fix the issue that check failed after subtree update to master

  3pointer

  committed
  e672312

  Copy full SHA for e672312

• remove extra space in MakeFile

  3pointer

  committed
  eac220c

  Copy full SHA for eac220c

• reorder the imports pkg in br

  3pointer

  committed
  efe39a0

  Copy full SHA for efe39a0

• update go.mod after rebase master && kvproto updated

  3pointer

  committed
  79c5aa4

  Copy full SHA for 79c5aa4

• reorder go imports by tidb requirements

  3pointer

  committed
  98f3e77

  Copy full SHA for 98f3e77

• br: reduce sleep seconds for unit test

  3pointer

  committed
  d2b005e

  Copy full SHA for d2b005e

• Merge branch 'master' into merge_br_squash

  3pointer

  authored
  fbfeee1

  Copy full SHA for fbfeee1

• fix: backup system table

  3pointer

  committed
  479dd2b

  Copy full SHA for 479dd2b

• address comment

  3pointer

  committed
  049a8e1

  Copy full SHA for 049a8e1

• Merge branch 'master' into merge_br_squash

  ti-chi-bot

  authored
  7cc48d4

  Copy full SHA for 7cc48d4

• Merge branch 'master' into merge_br_squash

  ti-chi-bot

  authored
  30ac421

  Copy full SHA for 30ac421

• Merge branch 'master' into merge_br_squash

  ti-chi-bot

  authored
  5a1c643

  Copy full SHA for 5a1c643