From: Sage Weil <sage@newdream.net>
Date: Thu, 21 Sep 2017 15:56:16 +0000 (-0500)
Subject: Merge pull request #17812 from liewegas/wip-21410-luminous
X-Git-Tag: ses5-gm~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a931cf68120d99661b785cc794e2b6965d621f06;p=ceph.git

Merge pull request #17812 from liewegas/wip-21410-luminous

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>
---

a931cf68120d99661b785cc794e2b6965d621f06