From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 6 May 2018 03:25:36 +0000 (+0800)
Subject: Merge pull request #21815 from xiexingguo/wip-23921
X-Git-Tag: v14.0.0~209
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d6429753e923cdbafcf88b20a8bac31caaddc61;p=ceph.git

Merge pull request #21815 from xiexingguo/wip-23921

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

Reviewed-by: huangjun <hjwsm1989@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

3d6429753e923cdbafcf88b20a8bac31caaddc61