From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 11 Apr 2018 19:52:23 +0000 (-0700)
Subject: Merge pull request #20829 from xiexingguo/backport-pr-20653
X-Git-Tag: v12.2.5~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=719e13ccfcc6cdf163d03ddfb0f55dbe0e338f48;p=ceph.git

Merge pull request #20829 from xiexingguo/backport-pr-20653

luminous: mon, osd: fix potential collided *Up Set* after PG remapping

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

719e13ccfcc6cdf163d03ddfb0f55dbe0e338f48