]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07aba4d 0823888)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.