Merge pull request #42997 from josephsawaya/wip-mgr-rook-orch-ls

author Sebastian Wagner <sewagner@redhat.com>

Thu, 14 Oct 2021 15:33:26 +0000 (17:33 +0200)

committer GitHub <noreply@github.com>

Thu, 14 Oct 2021 15:33:26 +0000 (17:33 +0200)
author Sebastian Wagner <sewagner@redhat.com>
Thu, 14 Oct 2021 15:33:26 +0000 (17:33 +0200)
committer GitHub <noreply@github.com>
Thu, 14 Oct 2021 15:33:26 +0000 (17:33 +0200)
diff --cc src/pybind/mgr/rook/module.py
Simple merge
diff --cc src/pybind/mgr/rook/rook_cluster.py
Simple merge
author	Sebastian Wagner <sewagner@redhat.com>
	Thu, 14 Oct 2021 15:33:26 +0000 (17:33 +0200)
committer	GitHub <noreply@github.com>
	Thu, 14 Oct 2021 15:33:26 +0000 (17:33 +0200)
		1	2
src/pybind/mgr/rook/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/rook/rook_cluster.py	patch \|	diff1 \|	diff2 \|	blob \| history