Merge pull request #22043 from dillaman/wip-24139
authorMykola Golub <mgolub@suse.com>
Wed, 26 Sep 2018 19:49:02 +0000 (22:49 +0300)
committerGitHub <noreply@github.com>
Wed, 26 Sep 2018 19:49:02 +0000 (22:49 +0300)
commit78881934c0d204c2f996efd169a215051b0ad862
tree5d69ee3cda6d0ffc1b408e0024f42fa86ed7a254
parent9ff70326da68f4aa23da772d2a4f867d3779f4d3
parent5c317aef31f569526df712053b4d8a5dc5119d94
Merge pull request #22043 from dillaman/wip-24139

rbd-mirror: bootstrap needs to handle local image id collision

Reviewed-by: Mykola Golub <mgolub@suse.com>