]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #30916 from smithfarm/wip-41457-mimic
authorYuri Weinstein <yweinste@redhat.com>
Mon, 21 Oct 2019 23:45:59 +0000 (16:45 -0700)
committerGitHub <noreply@github.com>
Mon, 21 Oct 2019 23:45:59 +0000 (16:45 -0700)
mimic: osd: merge replica log on primary need according to replica log's crt

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge