]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #24072 into master
authorSage Weil <sage@redhat.com>
Tue, 18 Sep 2018 12:09:52 +0000 (07:09 -0500)
committerSage Weil <sage@redhat.com>
Tue, 18 Sep 2018 12:09:52 +0000 (07:09 -0500)
commit62bad1b987cb875deb1c137594eb2ca181d93388
tree82cf260c86efacef5229be4c3a11bcb7b6e99f7e
parent5cd067b16b1b78b3700e7dabcdb496ef0164e214
parent8fc491161b5fd8f34f8ac562799ece7b702ddb86
Merge PR #24072 into master

* refs/pull/24072/head:
osd/PG: kill __queue_query__
osd/OSD: deprecate __project_pg_history__

Reviewed-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc
src/osd/PG.cc