]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15727 from ovh/bp-runtime-cfg-of-hb-inflator
authorGregory Farnum <greg@gregs42.com>
Wed, 21 Jun 2017 20:05:40 +0000 (16:05 -0400)
committerGitHub <noreply@github.com>
Wed, 21 Jun 2017 20:05:40 +0000 (16:05 -0400)
osd, messages/MOSDPing: bunch of fixes related to ping inflation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge