Merge pull request #38881 from ceph/default_images

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

Thu, 18 Feb 2021 11:10:33 +0000 (12:10 +0100)

committer GitHub <noreply@github.com>

Thu, 18 Feb 2021 11:10:33 +0000 (12:10 +0100)
author Sebastian Wagner <sebastian.wagner@suse.com>
Thu, 18 Feb 2021 11:10:33 +0000 (12:10 +0100)
committer GitHub <noreply@github.com>
Thu, 18 Feb 2021 11:10:33 +0000 (12:10 +0100)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Thu, 18 Feb 2021 11:10:33 +0000 (12:10 +0100)
committer	GitHub <noreply@github.com>
	Thu, 18 Feb 2021 11:10:33 +0000 (12:10 +0100)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history