Merge pull request #2452 from ceph/wip-pool-ls

author João Eduardo Luís <joao.luis@inktank.com>

Wed, 1 Oct 2014 16:22:42 +0000 (16:22 +0000)

committer João Eduardo Luís <joao.luis@inktank.com>

Wed, 1 Oct 2014 16:22:42 +0000 (16:22 +0000)
author João Eduardo Luís <joao.luis@inktank.com>
Wed, 1 Oct 2014 16:22:42 +0000 (16:22 +0000)
committer João Eduardo Luís <joao.luis@inktank.com>
Wed, 1 Oct 2014 16:22:42 +0000 (16:22 +0000)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	João Eduardo Luís <joao.luis@inktank.com>
	Wed, 1 Oct 2014 16:22:42 +0000 (16:22 +0000)
committer	João Eduardo Luís <joao.luis@inktank.com>
	Wed, 1 Oct 2014 16:22:42 +0000 (16:22 +0000)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history