]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #5396 from XinzeChi/wip-scrub-promote
authorSage Weil <sage@redhat.com>
Tue, 8 Sep 2015 15:41:38 +0000 (11:41 -0400)
committerSage Weil <sage@redhat.com>
Tue, 8 Sep 2015 15:41:38 +0000 (11:41 -0400)
commita7f1a3ac6cecddd3a9dda799e27c413fd952be00
tree89e6ee89318f5d12b19022ff3a0c5e3706a30884
parent026012fd62d0705109d665c2fa4af08ebb1c4d9f
parentf77949fedce3449befd74efeb5270579f5085b16
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>
src/osd/ReplicatedPG.cc