]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bd7559 482ec97)
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)
crush, osd: handle multiple parents properly when applying pg upmaps

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.