From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 9 May 2018 14:08:52 +0000 (+0800)
Subject: Merge pull request #21835 from tchaikov/mimic-23921
X-Git-Tag: v13.1.1~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2fc5c1a95d405095398f587354edca9e838da22e;p=ceph.git

Merge pull request #21835 from tchaikov/mimic-23921

mimic: crush, osd: handle multiple parents properly when applying pg upmaps

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

2fc5c1a95d405095398f587354edca9e838da22e