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 bug of same type plans with different plan ... (#19519) #19684

Merged
merged 6 commits into from
Sep 2, 2020
Merged

*: fix bug of same type plans with different plan ... (#19519) #19684

merged 6 commits into from
Sep 2, 2020

Commits on Sep 1, 2020

  1. cherry pick pingcap#19519 to release-4.0 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @crazycs520 @ti-srebot
    crazycs520 authored and ti-srebot committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    5eef6bb View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. fix conflict 

    Signed-off-by: crazycs520 <crazycs520@gmail.com>
    @crazycs520
    crazycs520 committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    57c19f2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-1cab3d59471a

    @crazycs520
    crazycs520 authored Sep 2, 2020
    Configuration menu
    Copy the full SHA
    43ab167 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into release-4.0-1cab3d59471a

    @ti-srebot
    ti-srebot authored Sep 2, 2020
    Configuration menu
    Copy the full SHA
    2ae991e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release-4.0' into release-4.0-1cab3d59471a

    @ti-srebot
    ti-srebot authored Sep 2, 2020
    Configuration menu
    Copy the full SHA
    79ecfb2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release-4.0' into release-4.0-1cab3d59471a

    @ti-srebot
    ti-srebot authored Sep 2, 2020
    Configuration menu
    Copy the full SHA
    9dfd77c View commit details
    Browse the repository at this point in the history