Merge pull request #13853 from tchaikov/wip-19134

author Kefu Chai <tchaikov@gmail.com>

Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)

committer GitHub <noreply@github.com>

Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)
committer GitHub <noreply@github.com>
Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)
diff --cc src/mon/MonClient.cc
Simple merge
diff --cc src/mon/MonClient.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)
committer	GitHub <noreply@github.com>
	Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)
		1	2
src/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.h	patch \|	diff1 \|	diff2 \|	blob \| history