]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29590 from Aran85/fix_proc_replica_log
authorKefu Chai <kchai@redhat.com>
Fri, 23 Aug 2019 06:59:02 +0000 (14:59 +0800)
committerGitHub <noreply@github.com>
Fri, 23 Aug 2019 06:59:02 +0000 (14:59 +0800)
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