From: Kefu Chai <kchai@redhat.com>
Date: Fri, 23 Aug 2019 06:59:02 +0000 (+0800)
Subject: Merge pull request #29590 from Aran85/fix_proc_replica_log
X-Git-Tag: v15.1.0~1796
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e909031d3c231052fdf0afe993f669514faadde6;p=ceph.git

Merge pull request #29590 from Aran85/fix_proc_replica_log

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

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

e909031d3c231052fdf0afe993f669514faadde6