Merge pull request #3000 from yuyuyu101/wip-10166

author Sage Weil <sage@redhat.com>

Tue, 16 Dec 2014 23:14:20 +0000 (15:14 -0800)

committer Sage Weil <sage@redhat.com>

Tue, 16 Dec 2014 23:14:20 +0000 (15:14 -0800)
author Sage Weil <sage@redhat.com>
Tue, 16 Dec 2014 23:14:20 +0000 (15:14 -0800)
committer Sage Weil <sage@redhat.com>
Tue, 16 Dec 2014 23:14:20 +0000 (15:14 -0800)
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 16 Dec 2014 23:14:20 +0000 (15:14 -0800)
committer	Sage Weil <sage@redhat.com>
	Tue, 16 Dec 2014 23:14:20 +0000 (15:14 -0800)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history