From: Samuel Just <sam.just@inktank.com>
Date: Thu, 9 Apr 2015 18:21:37 +0000 (-0700)
Subject: Merge pull request #4136 from XinzeChi/wip-pg-delete-sleep
X-Git-Tag: v9.0.1~159
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ae9e6bc150eec702ca17a7c27659e32770d8807;p=ceph.git

Merge pull request #4136 from XinzeChi/wip-pg-delete-sleep

osd: return fast if PG::deleting is true in snap_trimmer and PG::scrub

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

7ae9e6bc150eec702ca17a7c27659e32770d8807