]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #12212 from trociny/wip-16991
authorJason Dillaman <dillaman@redhat.com>
Mon, 5 Dec 2016 16:20:03 +0000 (11:20 -0500)
committerGitHub <noreply@github.com>
Mon, 5 Dec 2016 16:20:03 +0000 (11:20 -0500)
commit566d01bfd25324844b19c8ac096ffc9c6fa67e41
treea874b9563b26a7b55ddd72415301390362f2621a
parentd75ffa43891acfae05622be78cbf392c44d973f2
parent6cb1ed485f89f30fe6dda31e77e16e23f9b5b2ab
Merge pull request #12212 from trociny/wip-16991

rbd-mirror: recovering after split-brain

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