Merge pull request #39804 from sebastian-philipp/octopus-backport-39770

author Yuri Weinstein <yweinste@redhat.com>

Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)

committer GitHub <noreply@github.com>

Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)
committer GitHub <noreply@github.com>
Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/cephadm/tests/test_cephadm.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)
committer	GitHub <noreply@github.com>
	Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history