Merge pull request #15925 from jcsp/wip-fsstatus-cleanup

author Kefu Chai <tchaikov@gmail.com>

Fri, 30 Jun 2017 01:31:02 +0000 (09:31 +0800)

committer GitHub <noreply@github.com>

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