]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #21815 from xiexingguo/wip-23921
authorKefu Chai <tchaikov@gmail.com>
Sun, 6 May 2018 03:25:36 +0000 (11:25 +0800)
committerGitHub <noreply@github.com>
Sun, 6 May 2018 03:25:36 +0000 (11:25 +0800)
commit3d6429753e923cdbafcf88b20a8bac31caaddc61
tree57f60253b396e1448a9dfda536bb00e83bfeaa9b
parent7bd7559ece02791c496464740cc16f992a37b133
parent482ec97c98107be20c9ca1f34636323703ecfa5c
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>