Merge pull request #32982 from krig/cephadm-fixes

author Kefu Chai <kchai@redhat.com>

Wed, 5 Feb 2020 12:44:58 +0000 (20:44 +0800)

committer GitHub <noreply@github.com>

Wed, 5 Feb 2020 12:44:58 +0000 (20:44 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 5 Feb 2020 12:44:58 +0000 (20:44 +0800)
committer GitHub <noreply@github.com>
Wed, 5 Feb 2020 12:44:58 +0000 (20:44 +0800)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 5 Feb 2020 12:44:58 +0000 (20:44 +0800)
committer	GitHub <noreply@github.com>
	Wed, 5 Feb 2020 12:44:58 +0000 (20:44 +0800)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history