]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* refs/pull/24072/head:
osd/PG: kill __queue_query__
osd/OSD: deprecate __project_pg_history__

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

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