]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>

Trivial merge