]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34204 into octopus
authorSage Weil <sage@redhat.com>
Sat, 28 Mar 2020 00:59:14 +0000 (19:59 -0500)
committerSage Weil <sage@redhat.com>
Sat, 28 Mar 2020 00:59:14 +0000 (19:59 -0500)
* refs/pull/34204/head:
osd/PeeringState: drop mimic assert

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

Simple merge