]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #29985 from xiexingguo/wip-41514-plus
authorXie Xingguo <xie.xingguo@zte.com.cn>
Fri, 6 Sep 2019 05:51:48 +0000 (13:51 +0800)
committerGitHub <noreply@github.com>
Fri, 6 Sep 2019 05:51:48 +0000 (13:51 +0800)
osd/PrimaryLogPG: cancel in-flight manifest ops on interval changing; fix race with scrub

Reviewed-by: Myoungwon Oh <ommw@sk.com>
1  2 
src/osd/PrimaryLogPG.cc

Simple merge