]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #30018 from xiexingguo/wip-38483
authorXie Xingguo <xie.xingguo@zte.com.cn>
Wed, 4 Sep 2019 00:31:39 +0000 (08:31 +0800)
committerGitHub <noreply@github.com>
Wed, 4 Sep 2019 00:31:39 +0000 (08:31 +0800)
osd: prime splits/merges for any potential fabricated split/merge participant

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge