From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Feb 2020 23:50:36 +0000 (-0600)
Subject: Merge PR #33525 into master
X-Git-Tag: v15.1.1~256
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c940e78b37ffdf8e8c74b437b3b52dea6734ae5;p=ceph.git

Merge PR #33525 into master

* refs/pull/33525/head:
	osd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved

Reviewed-by: David Zafman <dzafman@redhat.com>
---

9c940e78b37ffdf8e8c74b437b3b52dea6734ae5