Merge pull request #39602 from tchaikov/wip-mgr-flux-ann

author Kefu Chai <kchai@redhat.com>

Fri, 26 Feb 2021 03:37:28 +0000 (11:37 +0800)

committer GitHub <noreply@github.com>

Fri, 26 Feb 2021 03:37:28 +0000 (11:37 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 26 Feb 2021 03:37:28 +0000 (11:37 +0800)
committer GitHub <noreply@github.com>
Fri, 26 Feb 2021 03:37:28 +0000 (11:37 +0800)
diff --cc src/mypy.ini
Simple merge
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
diff --cc src/pybind/mgr/tox.ini
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 26 Feb 2021 03:37:28 +0000 (11:37 +0800)
committer	GitHub <noreply@github.com>
	Fri, 26 Feb 2021 03:37:28 +0000 (11:37 +0800)
		1	2
src/mypy.ini	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/serve.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history