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

BR: update br keep upstream #26972

Merged
merged 21 commits into from
Aug 8, 2021
Merged

BR: update br keep upstream #26972

merged 21 commits into from
Aug 8, 2021

Commits on Aug 5, 2021

  1. 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

  2. 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

Commits on Aug 6, 2021

  1. change the import path of br cmd/pkg

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

  2. change the failpoint path of br/tests

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

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

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

  4. change the import path of tidb

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

  5. remove cycle depenence in go.mod

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

  6. update Makefile

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

  7. change the import path after subtree update

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

  8. update go mod after merge master

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

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

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

  10. remove extra space in MakeFile

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

  11. reorder the imports pkg in br

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

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

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

  13. reorder go imports by tidb requirements

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

  14. br: reduce sleep seconds for unit test

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

  15. Merge branch 'master' into br_keep_upstream

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

  16. Squashed 'br/' changes from cf621d7c0..3b1308e89 

    3b1308e89 lightning: evaluate all generated columns even if they are virtual (pingcap#1407)
1b0e54c2f lightning: check and restore pd scheduler even if our task failed (pingcap#1336)
073d3596c lightning: fix the bug that calculate unfinished ranges may miss some range (pingcap#1413)
82ff927df backup: refine backup log for tracing backup tasks (pingcap#1335)
e907562e8 lightning: make create table ddl compatible with clustered index (pingcap#1364)
b6cab4b27 lightning: auto configure for parallel import (pingcap#1387)

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

  17. Merge commit 'cc25ce9f3fbc6971e757b2c4c856827144477784' into br_keep_… 

    …upstream
    @3pointer
    3pointer committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    ac0327c View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2021

  1. Merge branch 'master' into br_keep_upstream

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

  2. Merge branch 'master' into br_keep_upstream

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