]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33339 into master
authorSage Weil <sage@redhat.com>
Sun, 16 Feb 2020 15:29:44 +0000 (09:29 -0600)
committerSage Weil <sage@redhat.com>
Sun, 16 Feb 2020 15:29:44 +0000 (09:29 -0600)
* refs/pull/33339/head:
osd/PeeringState: require SERVER_OCTOPUS to respond to RenewLease

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PeeringState.cc

Simple merge