]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21835 from tchaikov/mimic-23921
authorKefu Chai <tchaikov@gmail.com>
Wed, 9 May 2018 14:08:52 +0000 (22:08 +0800)
committerGitHub <noreply@github.com>
Wed, 9 May 2018 14:08:52 +0000 (22:08 +0800)
mimic: crush, osd: handle multiple parents properly when applying pg upmaps

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Trivial merge