Merge pull request #42859 from mgfritch/cephadm-check-host-no-engine

author Sebastian Wagner <sewagner@redhat.com>

Wed, 8 Sep 2021 13:40:03 +0000 (15:40 +0200)

committer GitHub <noreply@github.com>

Wed, 8 Sep 2021 13:40:03 +0000 (15:40 +0200)
author Sebastian Wagner <sewagner@redhat.com>
Wed, 8 Sep 2021 13:40:03 +0000 (15:40 +0200)
committer GitHub <noreply@github.com>
Wed, 8 Sep 2021 13:40:03 +0000 (15:40 +0200)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
author	Sebastian Wagner <sewagner@redhat.com>
	Wed, 8 Sep 2021 13:40:03 +0000 (15:40 +0200)
committer	GitHub <noreply@github.com>
	Wed, 8 Sep 2021 13:40:03 +0000 (15:40 +0200)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history