From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Jun 2019 13:38:39 +0000 (-0500)
Subject: Merge PR #28567 into master
X-Git-Tag: v15.1.0~2395
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=00952582ddd1200abe16e4e14fb437899cdd873e;p=ceph-ci.git

Merge PR #28567 into master

* refs/pull/28567/head:
	Revert "mon/OSDMonitor: report pg[pgp]_num_target instead of pg[pgp]_num"

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

00952582ddd1200abe16e4e14fb437899cdd873e