Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: merge BR into TiDB #26655

Merged
merged 22 commits into from
Aug 5, 2021
Merged

*: merge BR into TiDB #26655

merged 22 commits into from
Aug 5, 2021

Commits on Aug 5, 2021

  1. Squashed 'br/' content from commit cf621d7c0 

    git-subtree-dir: br
git-subtree-split: cf621d7c0c5eb5cc5d6a42816f84fd2aabb55bfc
    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    f5053bc View commit details
    Browse the repository at this point in the history

  2. Merge commit 'f5053bc8f0b9594cdd5d45a7de8f110399eac49c' as 'br'

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    1778c1a View commit details
    Browse the repository at this point in the history

  3. change the import path of br cmd/pkg

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    86425ad View commit details
    Browse the repository at this point in the history

  4. change the failpoint path of br/tests

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    ef685b7 View commit details
    Browse the repository at this point in the history

  5. change the import path of br/web br/tools

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    ac9fff4 View commit details
    Browse the repository at this point in the history

  6. change the import path of tidb

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    b81ec30 View commit details
    Browse the repository at this point in the history

  7. remove cycle depenence in go.mod

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    f180a34 View commit details
    Browse the repository at this point in the history

  8. update Makefile

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    713b2ac View commit details
    Browse the repository at this point in the history

  9. change the import path after subtree update

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    7ba8a29 View commit details
    Browse the repository at this point in the history

  10. update go mod after merge master

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    adcd502 View commit details
    Browse the repository at this point in the history

  11. fix the issue that check failed after subtree update to master

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    e672312 View commit details
    Browse the repository at this point in the history

  12. remove extra space in MakeFile

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    eac220c View commit details
    Browse the repository at this point in the history

  13. reorder the imports pkg in br

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    efe39a0 View commit details
    Browse the repository at this point in the history

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

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    79c5aa4 View commit details
    Browse the repository at this point in the history

  15. reorder go imports by tidb requirements

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    98f3e77 View commit details
    Browse the repository at this point in the history

  16. br: reduce sleep seconds for unit test

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    d2b005e View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' into merge_br_squash

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    fbfeee1 View commit details
    Browse the repository at this point in the history

  18. fix: backup system table

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    479dd2b View commit details
    Browse the repository at this point in the history

  19. address comment

    @3pointer
    3pointer committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    049a8e1 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' into merge_br_squash

    @ti-chi-bot
    ti-chi-bot committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    7cc48d4 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into merge_br_squash

    @ti-chi-bot
    ti-chi-bot committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    30ac421 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into merge_br_squash

    @ti-chi-bot
    ti-chi-bot committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    5a1c643 View commit details
    Browse the repository at this point in the history