Merge remote-tracking branch 'gh/wip-journal-aio-rebased'

author Sage Weil <sage@newdream.net>

Mon, 13 Feb 2012 22:31:17 +0000 (14:31 -0800)

committer Sage Weil <sage@newdream.net>

Mon, 13 Feb 2012 22:31:17 +0000 (14:31 -0800)
author Sage Weil <sage@newdream.net>
Mon, 13 Feb 2012 22:31:17 +0000 (14:31 -0800)
committer Sage Weil <sage@newdream.net>
Mon, 13 Feb 2012 22:31:17 +0000 (14:31 -0800)
diff --cc src/Makefile.am
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/os/FileStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 13 Feb 2012 22:31:17 +0000 (14:31 -0800)
committer	Sage Weil <sage@newdream.net>
	Mon, 13 Feb 2012 22:31:17 +0000 (14:31 -0800)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.h	patch \|	diff1 \|	diff2 \|	blob \| history