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

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil (#16003) #18413

Merged
merged 6 commits into from
Jul 28, 2020
Merged

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil (#16003) #18413

merged 6 commits into from
Jul 28, 2020

Commits on Jul 7, 2020

  1. cherry pick pingcap#16003 to release-4.0 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @reafans @ti-srebot
    reafans authored and ti-srebot committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    d4129e7 View commit details
    Browse the repository at this point in the history

  2. fix conflict 

    Signed-off-by: crazycs520 <crazycs520@gmail.com>
    @crazycs520
    crazycs520 committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    97f9a5a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into release-4.0-c635ac8cc40c

    @crazycs520
    crazycs520 authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    092d3d2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release-4.0' into release-4.0-c635ac8cc40c

    @zimulala
    zimulala authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    df414cb View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2020

  1. Merge branch 'release-4.0' into release-4.0-c635ac8cc40c

    @crazycs520
    crazycs520 authored Jul 10, 2020
    Configuration menu
    Copy the full SHA
    ea3cb83 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. Merge branch 'release-4.0' into release-4.0-c635ac8cc40c

    @ti-srebot
    ti-srebot authored Jul 28, 2020
    Configuration menu
    Copy the full SHA
    8cc2c7b View commit details
    Browse the repository at this point in the history