From: Sage Weil <sage@newdream.net>
Date: Wed, 24 Mar 2021 00:15:24 +0000 (-0400)
Subject: Merge PR #40320 into master
X-Git-Tag: v17.1.0~2501
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4d7d89557cface58e2acc7c74b33972d5752432;p=ceph.git

Merge PR #40320 into master

* refs/pull/40320/head:
	mgr/orchestrator: move PORTS column in 'orch ps' output

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

e4d7d89557cface58e2acc7c74b33972d5752432