]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 026012f f77949f)
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)
bug fix: osd: requeue_scrub when kick_object_context_blocked

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.