From: Sage Weil <sage@newdream.net>
Date: Fri, 2 Apr 2021 14:58:51 +0000 (-0500)
Subject: Merge PR #40544 into pacific
X-Git-Tag: v16.2.2~3^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2992b6cb579c88e0a7caa1fb784e2c2878f86ee5;p=ceph.git

Merge PR #40544 into pacific

* refs/pull/40544/head:
	mgr/orchestrator: move PORTS column in 'orch ps' output
	cephadm: fix failure when using --apply-spec and --shh-user
	cephadm: specify addr on bootstrap's host add
	mgr/cephadm: don't have upgrade fail if "." in patch section of version

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

2992b6cb579c88e0a7caa1fb784e2c2878f86ee5