Merge pull request #38927 from sebastian-philipp/cephadm-upgrade-retry-ceph-volume

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

Thu, 4 Feb 2021 10:56:52 +0000 (11:56 +0100)

committer GitHub <noreply@github.com>

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