Merge pull request #7628 from liewegas/wip-journal-block-size

author Sage Weil <sage@redhat.com>

Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)

committer Sage Weil <sage@redhat.com>

Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)
author Sage Weil <sage@redhat.com>
Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)
committer Sage Weil <sage@redhat.com>
Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/filestore/FileJournal.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history