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

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/PGLog.h

diff --cc src/osd/PGLog.h
Simple merge