]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #36663 from smithfarm/wip-46709-octopus
authorYuri Weinstein <yweinste@redhat.com>
Sat, 22 Aug 2020 18:04:59 +0000 (11:04 -0700)
committerGitHub <noreply@github.com>
Sat, 22 Aug 2020 18:04:59 +0000 (11:04 -0700)
octopus: osd/PeeringState: prevent peer's num_objects going negative

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

Trivial merge