]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23845 into master
authorSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 12:45:58 +0000 (07:45 -0500)
committerSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 12:45:58 +0000 (07:45 -0500)
* refs/pull/23845/head:
osd/OSDMap: include age in up and in counts for ceph status
mon/OSDMonitor: set new_last_{up,in}_change
osd/OSDMap: store last_up_change and last_in_change
mgr/MgrMap: include mgr age in map printer
mon/MgrMap: track active_changed timestamp
mon: include mon quorum age in status
include/utime: add utimespan_str helper

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/mon/Monitor.cc
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc
src/osd/OSDMap.h

Simple merge
Simple merge
Simple merge
Simple merge