From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 4 Nov 2019 20:28:10 +0000 (-0800)
Subject: Merge pull request #30917 from smithfarm/wip-41458-luminous
X-Git-Tag: v12.2.13~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2185b07174e0b07f60f1d44e7f1f2c27fd6b22b8;p=ceph.git

Merge pull request #30917 from smithfarm/wip-41458-luminous

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

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

2185b07174e0b07f60f1d44e7f1f2c27fd6b22b8