From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Nov 2019 13:09:50 +0000 (-0600)
Subject: Merge PR #31539 into master
X-Git-Tag: v15.1.0~936
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9491b58b6e9397bb8504d5997bf1fb3583aa40b;p=ceph.git

Merge PR #31539 into master

* refs/pull/31539/head:
	mgr/orchestrator_cli: sort by service name
	mgr/orchestrator_cli: collapse TYPE and ID columns

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

a9491b58b6e9397bb8504d5997bf1fb3583aa40b