Merge pull request #39599 from pcuzner/cephadm-with-lsm

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

Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)

committer GitHub <noreply@github.com>

Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)
author Sebastian Wagner <sebastian.wagner@suse.com>
Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)
committer GitHub <noreply@github.com>
Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)
diff --cc doc/cephadm/osd.rst
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)
committer	GitHub <noreply@github.com>
	Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)
		1	2
doc/cephadm/osd.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/serve.py	patch \|	diff1 \|	diff2 \|	blob \| history