From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Sep 2018 12:09:52 +0000 (-0500)
Subject: Merge PR #24072 into master
X-Git-Tag: v14.0.1~269
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=62bad1b987cb875deb1c137594eb2ca181d93388;p=ceph-ci.git

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>
---

62bad1b987cb875deb1c137594eb2ca181d93388