]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40437 into pacific
authorSage Weil <sage@newdream.net>
Sun, 28 Mar 2021 18:07:27 +0000 (13:07 -0500)
committerSage Weil <sage@newdream.net>
Sun, 28 Mar 2021 18:07:27 +0000 (13:07 -0500)
commit7e7e1f4ed3cc94c90a0e806a8c52e1798323bcc0
tree0673e07746b5e8642beb5791e42fe660b8149caf
parentdc0f201e5f3691bf8ab10e42ea603cabf5c37284
parent3bd341c11205e3a66739d7cf030e6c4f2c1e27c2
Merge PR #40437 into pacific

* refs/pull/40437/head:
mgr/cephadm: make upgrade progress bar mention target version, not repo digest
doc/cephadm: fix rgw realm and zone flags
mgr/volumes: do not overwrite existant mds specs
mgr/cephadm: no-overwite flag for apply command
mgr/orchestrator: remove image name field from 'orch ps' and 'orch ls'
cephadm: fix parsing of keepalived version (drop leading 'v')
cephadm: keepalived needs --cap-add=NET_RAW
cephadm: fix --cap-add=NET_ADMIN
cephadm: fix quoting for keepalived env var
mgr/cephadm: ha-rgw: use correct port
cephadm: validate fsid during cephadm shell command

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>