]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33525 into master
authorSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 23:50:36 +0000 (17:50 -0600)
committerSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 23:50:36 +0000 (17:50 -0600)
commit9c940e78b37ffdf8e8c74b437b3b52dea6734ae5
tree62848467a0adeeb50da288c7ea86eae70d72fe4c
parente5841cefb424093bdf9b4043573649bee85b0660
parent61152ac29654a819eb961e5fc2d7f63b706e15c9
Merge PR #33525 into master

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

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