]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40355 into pacific
authorSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 12:17:42 +0000 (07:17 -0500)
committerSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 12:17:42 +0000 (07:17 -0500)
* refs/pull/40355/head:
mgr/cephadm: Fix dashboard gateway configuration when using IPV6
qa/workunits/cephadm/test_cephadm: specify image separately
mgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart()
cephadm: prevent podman from breaking socket.getfqdn()
qa/tasks/cephadm: use 'orch apply mon' to deploy mons
qa/suites/rados/cephadm/upgrade: add centos upgrade on latest octopus
mgr/cephadm/upgrade: do not crash if error races with user cancellation
doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port
cephadm: only bootstrap using image that matches cephadm version
mgr/cephadm: redeploy daemons deployed using old image during upgrade
mgr/cephadm: add container digests of mgr that deployed daemon to unit.meta

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

Trivial merge