From: Yuri Weinstein <yweinste@redhat.com>
Date: Sat, 22 Aug 2020 18:04:59 +0000 (-0700)
Subject: Merge pull request #36663 from smithfarm/wip-46709-octopus
X-Git-Tag: v15.2.5~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46a1f5bbecc753cf6990e449b0bf3bdc9e256244;p=ceph.git

Merge pull request #36663 from smithfarm/wip-46709-octopus

octopus: osd/PeeringState: prevent peer's num_objects going negative

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

46a1f5bbecc753cf6990e449b0bf3bdc9e256244