Merge branch 'wip-tell' into next

author Sage Weil <sage@inktank.com>

Thu, 13 Jun 2013 16:27:15 +0000 (09:27 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 13 Jun 2013 16:27:15 +0000 (09:27 -0700)
author Sage Weil <sage@inktank.com>
Thu, 13 Jun 2013 16:27:15 +0000 (09:27 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 13 Jun 2013 16:27:15 +0000 (09:27 -0700)
diff --cc src/ceph.in
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 13 Jun 2013 16:27:15 +0000 (09:27 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 13 Jun 2013 16:27:15 +0000 (09:27 -0700)
		1	2
src/ceph.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history