From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Sep 2015 15:41:38 +0000 (-0400)
Subject: Merge pull request #5396 from XinzeChi/wip-scrub-promote
X-Git-Tag: v9.1.0~192
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7f1a3ac6cecddd3a9dda799e27c413fd952be00;p=ceph.git

Merge pull request #5396 from XinzeChi/wip-scrub-promote

bug fix: osd: requeue_scrub when kick_object_context_blocked

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

a7f1a3ac6cecddd3a9dda799e27c413fd952be00