Merge pull request #35503 from sebastian-philipp/rm-daemon-ok-to-stop

author Sebastian Wagner <sebastian.wagner@suse.com>

Thu, 25 Jun 2020 15:28:19 +0000 (17:28 +0200)

committer GitHub <noreply@github.com>

Thu, 25 Jun 2020 15:28:19 +0000 (17:28 +0200)
author Sebastian Wagner <sebastian.wagner@suse.com>
Thu, 25 Jun 2020 15:28:19 +0000 (17:28 +0200)
committer GitHub <noreply@github.com>
Thu, 25 Jun 2020 15:28:19 +0000 (17:28 +0200)
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Thu, 25 Jun 2020 15:28:19 +0000 (17:28 +0200)
committer	GitHub <noreply@github.com>
	Thu, 25 Jun 2020 15:28:19 +0000 (17:28 +0200)
		1	2
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/services/cephadmservice.py	patch \|	diff1 \|	diff2 \|	blob \| history