From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 16 Mar 2015 15:39:41 +0000 (+0100)
Subject: Merge pull request #3943 from dachary/wip-8011-firefly
X-Git-Tag: v0.80.10~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0abc4d769afd00773a9f466ffd3feced9cdb17d;p=ceph.git

Merge pull request #3943 from dachary/wip-8011-firefly

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

Reviewed-by: Samuel Just <sjust@redhat.com>
---

c0abc4d769afd00773a9f466ffd3feced9cdb17d