Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

backup/: retry for read index not ready and proposal in merging mode (#615) #626

Merged
merged 2 commits into from
Nov 27, 2020
Merged

backup/: retry for read index not ready and proposal in merging mode (#615) #626

merged 2 commits into from
Nov 27, 2020

Commits on Nov 27, 2020

  1. cherry pick pingcap#615 to release-4.0 

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

  2. resolve conflicts

    @lichunzhu
    lichunzhu committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    78021b6 View commit details
    Browse the repository at this point in the history