Merge pull request #15647 from gmayyyha/format-config-show

author Sage Weil <sage@newdream.net>

Fri, 7 Jul 2017 02:25:19 +0000 (21:25 -0500)

committer GitHub <noreply@github.com>

Fri, 7 Jul 2017 02:25:19 +0000 (21:25 -0500)
author Sage Weil <sage@newdream.net>
Fri, 7 Jul 2017 02:25:19 +0000 (21:25 -0500)
committer GitHub <noreply@github.com>
Fri, 7 Jul 2017 02:25:19 +0000 (21:25 -0500)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/common/config.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 7 Jul 2017 02:25:19 +0000 (21:25 -0500)
committer	GitHub <noreply@github.com>
	Fri, 7 Jul 2017 02:25:19 +0000 (21:25 -0500)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config.cc	patch \|	diff1 \|	diff2 \|	blob \| history