Merge pull request #7703 from xiexingguo/xxg-wip-statfs

author Sage Weil <sage@redhat.com>

Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)

committer Sage Weil <sage@redhat.com>

Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)
author Sage Weil <sage@redhat.com>
Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)
committer Sage Weil <sage@redhat.com>
Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 1 Mar 2016 13:45:39 +0000 (08:45 -0500)
		1	2
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history