]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15320 from liewegas/wip-peon-mapping
authorSage Weil <sage@newdream.net>
Sun, 28 May 2017 02:00:50 +0000 (21:00 -0500)
committerGitHub <noreply@github.com>
Sun, 28 May 2017 02:00:50 +0000 (21:00 -0500)
mon/OSDMonitor: cancel mapping job from update_from_paxos

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

Trivial merge