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

*: fix deadlock in new processor (#1987) #2017

Merged
merged 6 commits into from
Aug 11, 2021
Merged

*: fix deadlock in new processor (#1987) #2017

merged 6 commits into from
Aug 11, 2021

Commits on Jun 10, 2021

  1. This is an automated cherry-pick of pingcap#1987 

    Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
    @liuzix @ti-chi-bot
    liuzix authored and ti-chi-bot committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    810fd7a View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2021

  1. resolve conflict

    @liuzix
    liuzix committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    5409e39 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release-4.0' into cherry-pick-19… 

    …87-to-release-4.0
    @liuzix
    liuzix committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    5db448c View commit details
    Browse the repository at this point in the history

  3. fix check

    @liuzix
    liuzix committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    472b2ab View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2021

  1. Merge branch 'release-4.0' into cherry-pick-1987-to-release-4.0

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

  2. Merge branch 'release-4.0' into cherry-pick-1987-to-release-4.0

    @ti-chi-bot
    ti-chi-bot authored Aug 11, 2021
    Configuration menu
    Copy the full SHA
    491b0b5 View commit details
    Browse the repository at this point in the history