]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #30371 from pdvian/wip-41712-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Wed, 13 Nov 2019 20:06:40 +0000 (12:06 -0800)
committerGitHub <noreply@github.com>
Wed, 13 Nov 2019 20:06:40 +0000 (12:06 -0800)
nautilus: osd: prime splits/merges for any potential fabricated split/merge par…

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/OSD.cc

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