]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 878178f 4629e4d)
Merge PR #30721 into master
authorSage Weil <sage@redhat.com>
Sun, 6 Oct 2019 13:58:32 +0000 (08:58 -0500)
committerSage Weil <sage@redhat.com>
Sun, 6 Oct 2019 13:58:32 +0000 (08:58 -0500)
* refs/pull/30721/head:
osd/PeeringState: base lease support checks on features, not require_osd_release

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/PrimaryLogPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/PrimaryLogPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.