Merge pull request #8097 from aclamk/crushtool-pool-id

author Sage Weil <sage@redhat.com>

Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)

committer Sage Weil <sage@redhat.com>

Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)
author Sage Weil <sage@redhat.com>
Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)
committer Sage Weil <sage@redhat.com>
Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)
diff --cc src/test/cli/crushtool/help.t
Simple merge
diff --cc src/tools/crushtool.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)
committer	Sage Weil <sage@redhat.com>
	Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)
		1	2
src/test/cli/crushtool/help.t	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/crushtool.cc	patch \|	diff1 \|	diff2 \|	blob \| history