From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Aug 2019 17:52:16 +0000 (-0500)
Subject: Merge PR #29780 into master
X-Git-Tag: v15.1.0~1808
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d850edf0f960cd0317b47eb2b6ca07bb1af23481;p=ceph.git

Merge PR #29780 into master

* refs/pull/29780/head:
	osd/PeeringState: semi-colon after DECLARE_LOCALS
	osd/PeeringState: on_new_interval on child PG after split

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

d850edf0f960cd0317b47eb2b6ca07bb1af23481