]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #17812 from liewegas/wip-21410-luminous
authorSage Weil <sage@newdream.net>
Thu, 21 Sep 2017 15:56:16 +0000 (10:56 -0500)
committerGitHub <noreply@github.com>
Thu, 21 Sep 2017 15:56:16 +0000 (10:56 -0500)
Revert "osd/OSDMap: allow bidirectional swap of pg-upmap-items"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Trivial merge