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

resource_control: fix consumption less zero (#6983) #7033

Merged
merged 3 commits into from
Sep 5, 2023
Merged

resource_control: fix consumption less zero (#6983) #7033

merged 3 commits into from
Sep 5, 2023

Commits on Sep 1, 2023

  1. This is an automated cherry-pick of tikv#6983 

    close tikv#6973

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
    @CabinfeverB @ti-chi-bot
    CabinfeverB authored and ti-chi-bot committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    1a6209f View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. fix conflicts 

    Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
    @CabinfeverB
    CabinfeverB committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    1b39b05 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Merge branch 'release-7.1' into cherry-pick-6983-to-release-7.1

    @HuSharp
    HuSharp authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    5bade3c View commit details
    Browse the repository at this point in the history