From: Sage Weil <sage@redhat.com>
Date: Sat, 12 Oct 2019 18:32:52 +0000 (-0500)
Subject: Merge PR #30836 into master
X-Git-Tag: v15.1.0~1267
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e17ad58ee3ee97e7f6c5965ce3996c0940689a99;p=ceph-ci.git

Merge PR #30836 into master

* refs/pull/30836/head:
	osd/PeeringState: send pg_info2 if release >= octopus

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

e17ad58ee3ee97e7f6c5965ce3996c0940689a99