From: Sage Weil <sage@newdream.net>
Date: Fri, 28 Jul 2017 13:59:06 +0000 (-0500)
Subject: Merge pull request #16638 from liewegas/wip-20804
X-Git-Tag: v12.1.2~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4850aee7ad23e2f970001bd30964c98e61ac2d5;p=ceph.git

Merge pull request #16638 from liewegas/wip-20804

osd/PG: ignore CancelRecovery in NotRecovering

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

f4850aee7ad23e2f970001bd30964c98e61ac2d5