Merge pull request #834 from ceph/port/stat

author Sage Weil <sage@inktank.com>

Fri, 8 Nov 2013 08:26:17 +0000 (00:26 -0800)

committer Sage Weil <sage@inktank.com>

Fri, 8 Nov 2013 08:26:17 +0000 (00:26 -0800)
author Sage Weil <sage@inktank.com>
Fri, 8 Nov 2013 08:26:17 +0000 (00:26 -0800)
committer Sage Weil <sage@inktank.com>
Fri, 8 Nov 2013 08:26:17 +0000 (00:26 -0800)
diff --cc configure.ac
Simple merge
diff --cc src/client/Client.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 8 Nov 2013 08:26:17 +0000 (00:26 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 8 Nov 2013 08:26:17 +0000 (00:26 -0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history