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

store/copr: partly revert pr/35975, do it correctly this time (#55196) #55211

Merged
merged 4 commits into from
Sep 23, 2024
Merged

store/copr: partly revert pr/35975, do it correctly this time (#55196) #55211

merged 4 commits into from
Sep 23, 2024

Commits on Aug 6, 2024

  1. This is an automated cherry-pick of pingcap#55196 

    Signed-off-by: ti-chi-bot <[email protected]>
    @tiancaiamao @ti-chi-bot
    tiancaiamao authored and ti-chi-bot committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d7fa751 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. resolve conflict

    @tiancaiamao
    tiancaiamao committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    8d53e17 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release-7.5' into pr/55211

    @tiancaiamao
    tiancaiamao committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f71317e View commit details
    Browse the repository at this point in the history

  3. merge master

    @tiancaiamao
    tiancaiamao committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e71c120 View commit details
    Browse the repository at this point in the history