Merge pull request #42690 from adk3798/offline2

author Sebastian Wagner <sewagner@redhat.com>

Wed, 18 Aug 2021 10:00:33 +0000 (12:00 +0200)

committer GitHub <noreply@github.com>

Wed, 18 Aug 2021 10:00:33 +0000 (12:00 +0200)
author Sebastian Wagner <sewagner@redhat.com>
Wed, 18 Aug 2021 10:00:33 +0000 (12:00 +0200)
committer GitHub <noreply@github.com>
Wed, 18 Aug 2021 10:00:33 +0000 (12:00 +0200)
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
author	Sebastian Wagner <sewagner@redhat.com>
	Wed, 18 Aug 2021 10:00:33 +0000 (12:00 +0200)
committer	GitHub <noreply@github.com>
	Wed, 18 Aug 2021 10:00:33 +0000 (12:00 +0200)
		1	2
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/serve.py	patch \|	diff1 \|	diff2 \|	blob \| history