]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33732 into octopus
authorSage Weil <sage@redhat.com>
Wed, 11 Mar 2020 12:17:40 +0000 (07:17 -0500)
committerSage Weil <sage@redhat.com>
Wed, 11 Mar 2020 12:17:40 +0000 (07:17 -0500)
commit345996645e8b22789e004851192391c9e7efc2b9
treeb82de0586c113278c7d339fcef038150bec88fd0
parent07aba4deb91023dba9aa5af0e2c9c00cdde2986f
parent0823888dd27d4f8b427db6ee9812ff565b1377d2
Merge PR #33732 into octopus

* refs/pull/33732/head:
mon/MonClient: send logs to mon on separate schedule than pings
mon/MonClient: send logs to mon even if we have no keelalive2

Reviewed-by: Kefu Chai <kchai@redhat.com>