From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 21 Oct 2019 23:45:59 +0000 (-0700)
Subject: Merge pull request #30916 from smithfarm/wip-41457-mimic
X-Git-Tag: v13.2.7~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cde91c6962b1f8efcbc502c6ac64856d3238657;p=ceph.git

Merge pull request #30916 from smithfarm/wip-41457-mimic

mimic: osd: merge replica log on primary need according to replica log's crt

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

3cde91c6962b1f8efcbc502c6ac64856d3238657