From: Sage Weil <sage@redhat.com>
Date: Sat, 15 Feb 2020 14:37:13 +0000 (-0600)
Subject: Merge PR #33129 into master
X-Git-Tag: v15.1.1~402
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01c4dbbedb20de89d3ac029cb9416c6b089c002a;p=ceph.git

Merge PR #33129 into master

* refs/pull/33129/head:
	osd/PeeringState: do not start renewing leases until PG is activated

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

01c4dbbedb20de89d3ac029cb9416c6b089c002a