From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Dec 2019 14:49:52 +0000 (-0600)
Subject: Merge PR #32132 into master
X-Git-Tag: v15.1.0~577
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86512b71fc80d0016a4742b390deff31d5299a52;p=ceph.git

Merge PR #32132 into master

* refs/pull/32132/head:
	osd/OSDMap: rename old calc_pg_role -> calc_pg_role_broken
	osd/OSDMap: remove dead osd_is_valid_op_target
	osd/OSDMap: fix get_pg_acting_role()
	osd: use spg_t for pending_creates_from_osd
	osd/OSDMap: drop unused get_pg_acting_role()
	osd/OSDMap: fix+simplify is_up_acting_osd_shard
	osd: use new and improved calc_pg_role()
	osd/OSDMap: new calc_pg_role() that takes a pg_shard_t
	osd/OSDMap: calc_pg_rank -> calc_pg_role
	osd/PeeringState: debug lines for upacting_features, proc_lease
	osd/PeeringState: use pg_vector_string for operator<<

Reviewed-by: Samuel Just <sjust@redhat.com>
---

86512b71fc80d0016a4742b390deff31d5299a52