]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #24006 into master
authorSage Weil <sage@redhat.com>
Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
committerSage Weil <sage@redhat.com>
Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
commit57f307b682401dd534432ada31bffaa992f04a1e
tree3845fd73ae6ec9501a04195000fd2cdc013b48eb
parentecc9564fbb5599ea8e9c5526e6fc44c259069960
parent4c0804ad023ae258d2943e5563f66421d9490830
Merge PR #24006 into master

* refs/pull/24006/head:
osd/OSD: clear ping_history on heartbeat_reset
mon/OSDMonitor: share new maps with even non-active osds

Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc
src/osd/OSD.cc