]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit39a4a7a33f17a58fac8ae9ea1e9343aa31640063
treec35c23bbe86f0dc82df238184d6e4fb4cfdbfb42
parent58f6e521f6baab952572c029961012d9fd0f36a1
parentc05c41cf2aa0541d20c4ae0e65ba52fa5e960fae
Merge PR #34204 into octopus

* refs/pull/34204/head:
osd/PeeringState: drop mimic assert

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