Merge pull request #38883 from sebastian-philipp/cephadm-keep-deleted-specs

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

Fri, 12 Feb 2021 00:07:15 +0000 (01:07 +0100)

committer GitHub <noreply@github.com>

Fri, 12 Feb 2021 00:07:15 +0000 (01:07 +0100)
author Sebastian Wagner <sebastian.wagner@suse.com>
Fri, 12 Feb 2021 00:07:15 +0000 (01:07 +0100)
committer GitHub <noreply@github.com>
Fri, 12 Feb 2021 00:07:15 +0000 (01:07 +0100)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Fri, 12 Feb 2021 00:07:15 +0000 (01:07 +0100)
committer	GitHub <noreply@github.com>
	Fri, 12 Feb 2021 00:07:15 +0000 (01:07 +0100)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history