]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #4717 from athanatos/wip-8635
authorSamuel Just <sam.just@inktank.com>
Thu, 4 Jun 2015 18:25:12 +0000 (11:25 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 4 Jun 2015 18:25:12 +0000 (11:25 -0700)
commitb7abc398c03fa20a95e3081a2c09f11abc2cadf4
treea65f5d5d2f25d5bc1d7cc7f4387ede26b5a7cb07
parente5b18903bc778f02b33f0696c3224aead9155c4a
parent0f9979607629a0844f88b05140cb20bad4f48ea5
Merge pull request #4717 from athanatos/wip-8635

Wip 8635 -- Move scrub, snap_trim into a unified queue

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