From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Mar 2020 14:05:49 +0000 (-0600)
Subject: Merge PR #33728 into master
X-Git-Tag: v15.1.1~103
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cdc778d351875509a5b06f2719c6706bdb3a87f6;p=ceph-ci.git

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>
---

cdc778d351875509a5b06f2719c6706bdb3a87f6