Merge pull request #39673 from rzarzynski/wip-crimson-drop-protocol-v1

author Kefu Chai <kchai@redhat.com>

Tue, 2 Mar 2021 04:44:31 +0000 (12:44 +0800)

committer GitHub <noreply@github.com>

Tue, 2 Mar 2021 04:44:31 +0000 (12:44 +0800)
author Kefu Chai <kchai@redhat.com>
Tue, 2 Mar 2021 04:44:31 +0000 (12:44 +0800)
committer GitHub <noreply@github.com>
Tue, 2 Mar 2021 04:44:31 +0000 (12:44 +0800)
diff --cc src/crimson/mon/MonClient.cc
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 2 Mar 2021 04:44:31 +0000 (12:44 +0800)
committer	GitHub <noreply@github.com>
	Tue, 2 Mar 2021 04:44:31 +0000 (12:44 +0800)
		1	2
src/crimson/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history