Merge pull request #649 from ceph/wip-6422

author Sage Weil <sage@inktank.com>

Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
author Sage Weil <sage@inktank.com>
Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history