]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #30051 from smithfarm/wip-41456-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Mon, 4 Nov 2019 20:48:46 +0000 (12:48 -0800)
committerGitHub <noreply@github.com>
Mon, 4 Nov 2019 20:48:46 +0000 (12:48 -0800)
nautilus: core: osd: merge replica log on primary need according to replica log's crt

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

Trivial merge