]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33868 into octopus
authorSage Weil <sage@redhat.com>
Fri, 13 Mar 2020 02:55:52 +0000 (21:55 -0500)
committerSage Weil <sage@redhat.com>
Fri, 13 Mar 2020 02:55:52 +0000 (21:55 -0500)
commitd5cd03207becc11e0c6645f30bda391996802bb4
tree858b1a958e38c5d861e0fc5ee1ff30237b3cd684
parentc36406a91bf4b9aba744da33b0790a0a11fba6b3
parentbdbeeed680b74b77ed7bee61bba480c7aa86f06a
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>