]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5841ce 61152ac)
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)
* refs/pull/33525/head:
osd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.