Merge remote-tracking branch 'gh/firefly'

author Sage Weil <sage@inktank.com>

Wed, 12 Mar 2014 02:20:27 +0000 (19:20 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 12 Mar 2014 02:20:27 +0000 (19:20 -0700)
author Sage Weil <sage@inktank.com>
Wed, 12 Mar 2014 02:20:27 +0000 (19:20 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 12 Mar 2014 02:20:27 +0000 (19:20 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 12 Mar 2014 02:20:27 +0000 (19:20 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 12 Mar 2014 02:20:27 +0000 (19:20 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history