]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9231 from athanatos/wip-recovery-wq
authorSage Weil <sage@redhat.com>
Fri, 20 May 2016 17:26:02 +0000 (13:26 -0400)
committerSage Weil <sage@redhat.com>
Fri, 20 May 2016 17:26:02 +0000 (13:26 -0400)
osd: Put background recovery tasks in the main OpWQ

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
Simple merge
Simple merge