]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40924 into master
authorSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:27:07 +0000 (14:27 -0400)
committerSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:27:07 +0000 (14:27 -0400)
* refs/pull/40924/head:
mgr/cephadm: check hostname resolution before adding host
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
1  2 
doc/cephadm/host-management.rst
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py

Simple merge
Simple merge
Simple merge
Simple merge