]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40544 into pacific
authorSage Weil <sage@newdream.net>
Fri, 2 Apr 2021 14:58:51 +0000 (09:58 -0500)
committerSage Weil <sage@newdream.net>
Fri, 2 Apr 2021 14:58:51 +0000 (09:58 -0500)
commit2992b6cb579c88e0a7caa1fb784e2c2878f86ee5
treee19f42e74f1cb3c4146fecdf5687456bdefa9aec
parente010a7aeb144b1d2e29c547cd26d140834c7544e
parent72c12c84b06d39904e31989d599ac102c7d36af7
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>