From: Sage Weil <sage@redhat.com>
Date: Thu, 11 Dec 2014 21:42:09 +0000 (-0800)
Subject: Merge pull request #3155 from athanatos/wip-8011
X-Git-Tag: v0.91~52^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfa54bbbc7616e32ef294de806ea4c7b0336c035;p=ceph.git

Merge pull request #3155 from athanatos/wip-8011

ReplicatedPG: fail a non-blocking flush if the object is being scrubbed

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

cfa54bbbc7616e32ef294de806ea4c7b0336c035