From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Sep 2019 14:19:21 +0000 (-0500)
Subject: Merge PR #29835 into master
X-Git-Tag: v15.1.0~1698
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e2c9269a06a6e6a57111a2e388b688b63b02828;p=ceph.git

Merge PR #29835 into master

* refs/pull/29835/head:
	osd/PeeringState: fix wrong history of merge target

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

6e2c9269a06a6e6a57111a2e388b688b63b02828