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

expression: fix errors in Apply when the type of c ... (#19331) #19692

Merged
merged 12 commits into from
Sep 3, 2020
Merged

expression: fix errors in Apply when the type of c ... (#19331) #19692

merged 12 commits into from
Sep 3, 2020

Commits on Sep 2, 2020

  1. cherry pick pingcap#19331 to release-4.0 

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

  2. Merge remote-tracking branch 'upstream/release-4.0' into release-4.0-… 

    …853e0b49290c
    @qw4990
    qw4990 committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    ba2ca4e View commit details
    Browse the repository at this point in the history

  3. resolve conflicts

    @qw4990
    qw4990 committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    9923392 View commit details
    Browse the repository at this point in the history

  4. resolve conflicts

    @qw4990
    qw4990 committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    99eddb7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release-4.0' into release-4.0-853e0b49290c

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

  6. Merge branch 'release-4.0' into release-4.0-853e0b49290c

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

  7. Merge branch 'release-4.0' into release-4.0-853e0b49290c

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

  8. Merge remote-tracking branch 'upstream/release-4.0' into release-4.0-… 

    …853e0b49290c
    @qw4990
    qw4990 committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    c2f767c View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. Merge branch 'release-4.0' into release-4.0-853e0b49290c

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

  2. Merge branch 'release-4.0' into release-4.0-853e0b49290c

    @qw4990
    qw4990 authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    018bdd6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into release-4.0-853e0b49290c

    @qw4990
    qw4990 authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    a06ca2f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release-4.0' into release-4.0-853e0b49290c

    @zz-jason
    zz-jason authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    a6981ff View commit details
    Browse the repository at this point in the history