From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Mar 2015 19:15:21 +0000 (-0700)
Subject: Merge pull request #4162 from athanatos/wip-11156
X-Git-Tag: v0.94~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4dbb9c872eb7222c06893840b6fe7b5c4a66d037;p=ceph.git

Merge pull request #4162 from athanatos/wip-11156

ReplicatedPG::promote_object: check scrubber and block if necessary

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

4dbb9c872eb7222c06893840b6fe7b5c4a66d037