]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2bc0fc8 deb8ea4)
Merge pull request #3973 from XinzeChi/wip-scrub-pending
authorSamuel Just <sam.just@inktank.com>
Mon, 22 Jun 2015 22:17:46 +0000 (15:17 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 22 Jun 2015 22:17:46 +0000 (15:17 -0700)
commitf4391a905ef3a8ac3f3a2be65723cd34f0901b61
treee13aef4a75385daaaa4a8ce890ccc91d4c30f4f0tree | snapshot
parent2bc0fc84c559397e4ac820b08d1bc7294c486350commit | diff
parentdeb8ea44ce878d25ac76a0264911a2bd824a140bcommit | diff
Merge pull request #3973 from XinzeChi/wip-scrub-pending

osd: check pending or active scrub before sched_scrub

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/OSD.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.