]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #30503 into master
authorSage Weil <sage@redhat.com>
Mon, 23 Sep 2019 14:11:57 +0000 (09:11 -0500)
committerSage Weil <sage@redhat.com>
Mon, 23 Sep 2019 14:11:57 +0000 (09:11 -0500)
* refs/pull/30503/head:
osd/PeeringState: recover_got - add special handler for empty log

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

Simple merge