Merge pull request #2553 from ceph/wip-aio-journal

author Samuel Just <sam.just@inktank.com>

Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)

committer Samuel Just <sam.just@inktank.com>

Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)
author Samuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)
committer Samuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)
diff --cc src/os/FileJournal.cc
Simple merge
diff --cc src/os/FileJournal.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)
		1	2
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.h	patch \|	diff1 \|	diff2 \|	blob \| history