Merge pull request #16687 from Songweibin/wip-xml-format

author Kefu Chai <tchaikov@gmail.com>

Sun, 20 Aug 2017 05:59:22 +0000 (13:59 +0800)

committer GitHub <noreply@github.com>

Sun, 20 Aug 2017 05:59:22 +0000 (13:59 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 20 Aug 2017 05:59:22 +0000 (13:59 +0800)
committer GitHub <noreply@github.com>
Sun, 20 Aug 2017 05:59:22 +0000 (13:59 +0800)
diff --cc src/test/cli-integration/rbd/formatted-output.t
Simple merge
diff --cc src/test/cli/rbd/help.t
Simple merge
diff --cc src/tools/rbd/Utils.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 20 Aug 2017 05:59:22 +0000 (13:59 +0800)
committer	GitHub <noreply@github.com>
	Sun, 20 Aug 2017 05:59:22 +0000 (13:59 +0800)
		1	2
src/test/cli-integration/rbd/formatted-output.t	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/rbd/help.t	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd/Utils.cc	patch \|	diff1 \|	diff2 \|	blob \| history