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

server: existing statistics will not be deleted when putting store && check when store status changing (#3200) #3206

Merged
merged 3 commits into from
Nov 26, 2020
Merged

server: existing statistics will not be deleted when putting store && check when store status changing (#3200) #3206

merged 3 commits into from
Nov 26, 2020

Commits on Nov 24, 2020

  1. cherry pick tikv#3200 to release-4.0 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @HunDunDM @ti-srebot
    HunDunDM authored and ti-srebot committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    57570ca View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. resolve conflict 

    Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
    @HunDunDM
    HunDunDM committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    5f16bf4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-57bfeb79631e

    @ti-chi-bot
    ti-chi-bot authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    030e557 View commit details
    Browse the repository at this point in the history