Merge pull request #6486 from XinzeChi/wip-multiple-finisher

author Sage Weil <sage@redhat.com>

Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)
author Sage Weil <sage@redhat.com>
Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/os/FileStore.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.h	patch \|	diff1 \|	diff2 \|	blob \| history