]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29754 from xiexingguo/wip-inc-recovery-3
authorXie Xingguo <xie.xingguo@zte.com.cn>
Sat, 24 Aug 2019 05:51:21 +0000 (13:51 +0800)
committerGitHub <noreply@github.com>
Sat, 24 Aug 2019 05:51:21 +0000 (13:51 +0800)
osd: misc inc-recovery compat fixes

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

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