From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Mar 2020 02:55:52 +0000 (-0500)
Subject: Merge PR #33868 into octopus
X-Git-Tag: v15.1.1~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5cd03207becc11e0c6645f30bda391996802bb4;p=ceph-ci.git

Merge PR #33868 into octopus

* refs/pull/33868/head:
	mgr/rook: implement remove_daemons()
	mgr/rook: fix mds/fs create/apply/update
	mgr/rook: use ceph_daemon_id label consistently
	mgr/rook: show filesystems in 'orch ls'
	mgr/orch: 'age' -> 'ago' in 'orch ls' output
	mgr/rook: initial pass at 'orch ls'
	mgr/rook: include timestamps in 'orch ps'
	mgr/orch: shorten container_id (hash) in cephadm, not orch ps
	mgr/rook: include container_image_name in 'orch ps'
	mgr/rook: fix list_daemons host arg

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

d5cd03207becc11e0c6645f30bda391996802bb4