]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33728 into master
authorSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 14:05:49 +0000 (08:05 -0600)
committerSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 14:05:49 +0000 (08:05 -0600)
commitcdc778d351875509a5b06f2719c6706bdb3a87f6
tree32579999e7837af58cc889ce3c0d64fdda8a022c
parente8c268d1d4bf79c8eb3afc79291a1d5c05af25e9
parent94e77cc9c4facb0e8d4b46d0062d5eca5b279a0b
Merge PR #33728 into master

* refs/pull/33728/head:
mgr/orch: factor out nice_delta
mgr/orch: show spec age in 'orch ls'
mgr/cephadm: store timestamp with specs
mgr/orch: add created timestamp to ServiceDescription
mgr/orch: include uptime in 'orch ps'
mgr/orch: include AGE column in 'orch ps'
mgr/cephadm: populate new DaemonDescription timestamps
mgr/orch: add new timestamps in DaemonDescription
cephadm: include timestamps for configured, created
cephadm: include timestamps for started, deploy

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>