Merge pull request #10196 from xiaoxichen/fix_16609

author Kefu Chai <tchaikov@gmail.com>

Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)

committer GitHub <noreply@github.com>

Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)
committer GitHub <noreply@github.com>
Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)
diff --cc src/common/LogClient.cc
Simple merge
diff --cc src/common/LogClient.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)
committer	GitHub <noreply@github.com>
	Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)
		1	2
src/common/LogClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/LogClient.h	patch \|	diff1 \|	diff2 \|	blob \| history