]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #34512 from Vicente-Cheng/wip-44324-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Mon, 27 Apr 2020 21:32:26 +0000 (14:32 -0700)
committerGitHub <noreply@github.com>
Mon, 27 Apr 2020 21:32:26 +0000 (14:32 -0700)
nautilus: osd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved

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

Trivial merge