Merge pull request #23699 from tchaikov/wip-monc-drop-rwlock

author Kefu Chai <tchaikov@gmail.com>

Tue, 28 Aug 2018 07:36:23 +0000 (15:36 +0800)

committer GitHub <noreply@github.com>

Tue, 28 Aug 2018 07:36:23 +0000 (15:36 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 28 Aug 2018 07:36:23 +0000 (15:36 +0800)
committer GitHub <noreply@github.com>
Tue, 28 Aug 2018 07:36:23 +0000 (15:36 +0800)
diff --cc src/mon/MonClient.cc
Simple merge
diff --cc src/mon/MonClient.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 28 Aug 2018 07:36:23 +0000 (15:36 +0800)
committer	GitHub <noreply@github.com>
	Tue, 28 Aug 2018 07:36:23 +0000 (15:36 +0800)
		1	2
src/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history