]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
rbd-mirror: recovering after split-brain

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

Trivial merge