Merge pull request #687 from ceph/wip-pool

author Sage Weil <sage@inktank.com>

Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)
author Sage Weil <sage@inktank.com>
Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history