]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e133ddc e8cce08)
Merge pull request #5891 from Abhishekvrshny/wip-13035-hammer
authorLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 09:30:54 +0000 (10:30 +0100)
committerLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 09:30:54 +0000 (10:30 +0100)
requeue_scrub when kick_object_context_blocked

Reviewed-by: Sage Weil <sage@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.