Merge pull request #15497 from liewegas/wip-log-last

author Kefu Chai <tchaikov@gmail.com>

Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)

committer GitHub <noreply@github.com>

Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)
committer GitHub <noreply@github.com>
Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)
committer	GitHub <noreply@github.com>
	Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history