From: Sage Weil <sage@newdream.net>
Date: Sun, 28 May 2017 02:00:50 +0000 (-0500)
Subject: Merge pull request #15320 from liewegas/wip-peon-mapping
X-Git-Tag: v12.1.0~57^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5628543ca0b439faed3d16887052604ffe1c608;p=ceph.git

Merge pull request #15320 from liewegas/wip-peon-mapping

mon/OSDMonitor: cancel mapping job from update_from_paxos

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

c5628543ca0b439faed3d16887052604ffe1c608