67ef399634024ff971a6ab0cdc18c2a1bed74d02
* changes: CherryPick: Keep going in the face of a single merge conflict CherryPick: Test for submitting a subset of dependent changes
Description
RETIRED, Gerrit as used by OpenStack
* changes: CherryPick: Keep going in the face of a single merge conflict CherryPick: Test for submitting a subset of dependent changes