Merge pull request #2042 from ceph/wip-port-fixes

author Sage Weil <sage@inktank.com>

Fri, 11 Jul 2014 22:02:39 +0000 (15:02 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 11 Jul 2014 22:02:39 +0000 (15:02 -0700)
author Sage Weil <sage@inktank.com>
Fri, 11 Jul 2014 22:02:39 +0000 (15:02 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 11 Jul 2014 22:02:39 +0000 (15:02 -0700)
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/os/FileStore.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 11 Jul 2014 22:02:39 +0000 (15:02 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 11 Jul 2014 22:02:39 +0000 (15:02 -0700)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.h	patch \|	diff1 \|	diff2 \|	blob \| history