]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e010a7a 72c12c8)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.