]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit42b4ead1a05274fb0bff0e92231c4b82ce0ae6f4
treeeae60bec99e2c1d1ff2ad5f6195035b275c1fe98
parenta5ec44f8e47f53f8f2b6def78766d80da35edc5e
parent1e23065f2b42b59519f44d7b31a327a3000e788d
Merge pull request #34512 from Vicente-Cheng/wip-44324-nautilus

nautilus: osd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved

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