From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 5 Dec 2016 16:20:03 +0000 (-0500)
Subject: Merge pull request #12212 from trociny/wip-16991
X-Git-Tag: v11.1.0~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=566d01bfd25324844b19c8ac096ffc9c6fa67e41;p=ceph.git

Merge pull request #12212 from trociny/wip-16991

rbd-mirror: recovering after split-brain

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

566d01bfd25324844b19c8ac096ffc9c6fa67e41